Add auto lock and remove silly cursor line