Improved version of the UI