UX fixes from Bernie's suggestions