UI Fixes (hopefully)