Continuing working on home template