Cleaned up some of the buttons.