Big menu system updates, some fixes and cleanup