Small fixes for UX & recommendations