WIP: Clean up and rework UI