Minor fixes and layout tweaks