Refactored main templates