updated GUI and TODO