Tried to fix the GUI issues