Button Soup

Too many competing buttons/actions.