Added some gui elements and fixed minor bugs