Improved the UI Structure