Layout changed to improve UX