Tweaks for better use of space and layout