Tiny fixes to layout