clean up, new branch, product grid set up