Added buttons and functionality

Integrating Abhay code with Master.