Menu fixes and additions

+ Added PHPDoc 
+ Cleanup some code
+ Make message more humane (readable)
+ i18n fixes

See diff