Improved the design of the UI