wip + UI clear up