updated grid + minor redesign