some minor fixes to layout