Fix orientation bug and crashes
Fix merge conflicts