Add support for home template
Cleanup