UI changes and fixes