-GUI Refactored