updated to use grid system