Implementing new grid system