removed a few buttons
merge conflict resolved, reduced buttons