Fixed a few bugs and modified some ui elements.