Add buttons to input controller
Better input mapping