Menu work day 1.
Menu work day 2.
Fixed menu scalability
MERGE, dont think anything broke...
ops
Merge remote-tracking branch 'origin/master' into BOStateManager