Menu fixed height
Merge branch 'new-design'