tempo
merge
style buttons, and update activity strings