Tweaks to base layout