Feature/frontend fix code

Merged Prakhar Dayal requested to merge feature/frontend_fix_code into develop

Modified the design of map page and solved the merge conflict

Merge request reports