Feature/frontend modify

Merged Prakhar Dayal requested to merge feature/frontend_modify into develop

Merge request reports