Cache queries where the data will not change very frequently
Neaten up the user interface
Cache the menu/module queries
Merge pull request #548 from timschofield/develop

Develop