Update on change instead of by buttons, cleaned up UI