fixed menu overflow issue
Merge branch 'paul' into devbranch