Make some more UI Changes