Some redesign, some more CSS