Moved menu creation to menu handler included this should close #608 and makes it easier to handle access control.