Minor fixes to layout