Clean up mess from last few commits
Remove double database calls from controllers.php
Add categories to all templates