added grid component back in