Revert "[DEV] Change from last Commit"

This reverts commit 7d4f53d6f1b9a487c909fe204e539945ca8302bb.
Revert "[DEV] Change max menu items to 32"

This reverts commit 34d320dca1a93d86211f01b55433c0b9a08cc377.