add refresh buttons
UI improvements with selection