Removed columns on main menu
Merge branch 'dev' into beta