UI Changes updated