Display Tweaks

Minor changes. Mostly tidying up