Reorder config for clarity
Tidy up monad layout highlighting
Add next/previous group shortcuts