Changed from labels to buttons