Further UI Tweeks and stylin