debug code cleanup
generic menu routing (for dynamic structure support)
dynamic structure menu code fixes