added buttons
merged changes from remote