[MM] tweaks to UX