Re-arranging to add navigation based on groups