Add grid system & change to 2 colum layout