typo, and use correct variable name
Rename organisation icons to be consistent
Port over the organisations to seperate page instead of tabs. Closes #515