Added shortcut for "toggle all".

Includes a tidy up.