Added buttons.
Getting ready for merge