Revert "[DEV] Change from last Commit"

This reverts commit 85f332de0450c8274af898a1ec202f1e11646271.
Revert "[DEV] Change max menu items to 32"

This reverts commit 36a8c1722e31f88e98d297ba72a48ada908a8c4f.