Collapsable menu for small screens
Merge branch 'master' into funcfix