WIP: refactor UI