HomeVIew + Template and Impl List  bug fix
(cherry picked from commit ebe5402)