better focus indicator

code shuffling