Fixed some issues in the GUI