UI changes and other improvements