Enhance the UI a bit