Renamed twig blocks mainNavi -> menu and body -> main
Moved links to sidebar.