Gui & Refactor