Clean up extended statics a bit
FIX Tidy up controller code so that menu methods always return expected
FIX Add exists to menu check in template
Merge in template changes from 3.0 branch