Improve the UI quite a bit