Tweaked UI setup