Small fixes to layout