Removed menu-helper because it doesn't work as well as I'd like. May add back later with different structure.