update to clickable layout - better UX