minor changes to buttons and indentation
merge