Added detail view and deadzone calibration
Added dead zone
Fixed merge conflicts