Updating my develop

This update should include the grid clear button