Fixed the Gui Issues, Closes #19