Fixed a few bugs in the ui