more UI Changes