Fixed bug and cleaned up UI