refactor data factories to work with a nicer toolbar