Streamlined the buttons