clean up spacing and icons