Refactored Templates Into Home App