Consistency Updates

- updated the templates for better output consistency
- reordered the templates for better row based consistency
- adjusted the css to match