Fixed moving and Added keyboard moving