Make the UI better
It currently looks like this:
