Fixes to layout