Updated onclick events

TODO: better implementation of player puck
Fixed spacing between button groups