menu fixed
Merge branch 'features/about' into dev