Tidy ups

* Removed warnings
* Optimisations
* Increased the number of menu items returned by the 'menu items' actions