Refactored categories into nice templates