Added a few UI changes