Futher UI Changes