app structure fixes and custom main menu directives