WIP - enhance UI