Enhancing the UI