Adverse UI Tweaks

Various UI tweaks