Change layout to use grid system