Manual select context - Part 1: UI changes