cleanup; add some (lame) icons