fixed conflicts
Merge branch 'master' into wip
made the menu percentage based