* Reverted menu registration back to 3.1 method until I have more time to test it properly.