layout page design fixes
Merge branch 'development'