put logo back, improve grid system