Fix anchor tags and menu item sequences

Fixes missing anchor tags and puts menu items in correct sequence.