Simplified, removed idea of 'focused' mode, which is now just selected
mode + in focus.