Changed the buttons to a separate class.