updated button functionality
updated javascript
commit conflict resolution