Fixed key saving problems. Updated bindings saving logic.
fix ordering