cleaned up some verbage and added custom icons