Better ui

Closes #6