some fixes in base and home templates.