New Main: fix main menu behavior
Merge branch 'master' of github.com:mediasite/misc-verstka