Some UX improvements + one more simplification.