Fixed Keyboard move and zoom

Was originally incorrect branch