Made some unfinished UI changes