Tweaks to the UI - requires work.