Updated layout based on UX feedback