Layout and UX improvements