Revamped menu
Merge branch 'master' into ws-direct
Changed config for ws-direct branch