Added feedback, icons and other touchups.