Fixed controller button handling

axis still doesn't work