Enhance the UI