Added buttons and initial functionality