Fixes to layout page