Layout fix
Merge branch 'frontend_implementation' into Development