Menu commit

Fixes to menu and header