Menus now use active class attribute correctly
Cleaned up menu creation code