1. Remapped keys
2. Added control for 2 angles