Fixes to layout.