code tweaks based on UX feedback