Solved some minor bugs on the GUI