refresh buttons, overall small improvements