wip GUI fixed