Added new GUI, working okay