Fix 1 for back click feature + versioning