Messed up previous merge conflict. Fixed homeTemplate so as to follow file from branch toolTips