Reorder Boxes for better comprehension

linked to organization from #138
- fixed some missing tags.