Template / View Refactoring