fix grid spacing and change button icons