Add variables to buttons
Merge remote-tracking branch 'origin/UI' into UI