Fix submodule logic and small cleanup
Normalize injector for skin
Added menu and menu-item directives, for later