Add tracker selector to Tasks menu.
Tidy up.

- fix formating (indentions etc.)