Move grid variables into grid partial
Hide ds_store