Updated view to new grid system