Revert "[DEV] Change from last Commit"

This reverts commit 26bd22b37cb5d700abe7e2f8e3f2ab2a993f98b9.
Revert "[DEV] Change max menu items to 32"

This reverts commit 9641259857f01a1c910b9cf902d242540525a324.