Moved no products message to the CMS. Minor tidy ups.