Move orientation lock button and fix connection not displaying correct state