Neaten up the user interface
Cache the menu/module queries