Fix controls in Menu
Change dependency order in include list