Made Lots of UI Changes