Minor UX tweaks; prepare pages for user testing