Fixed a couple of the issues from GitHub with the UI