more button changes, icons are better!