Got most of the dynamic menu system working - just a few e2e unit tests to fix