Improved Layout and UX