Fixed a few GUI issues