v3

mostly clean up
also added some icons