Visual Tweaks

Preparing more work on Options