Layout Tweaks

Based on user-feedback.