UI Changes & Fixes!