tricky UI changes, hopefully simplifying main user experience...