Fixed a few bugs and change indentation in the UI