Finished Final UI Changes