Fix UI Changes