updated button mapping