Updated usercontrol button mapping