Cleanup, linked some of the home buttons
removed template-home