Refactoring, add grab cursor