Some more UI Changes