wip: clean fix ui & logic