favourite UX improvements + tests