better UI Changes