UI Changes done