Better Controlls and mapping