Make into css rows and columns, and style fixes