Fixed cursor position and added more hot keys