Dynamic menus now work, but improvements are needed