Remove duplicated points
Fix keyboard shortcuts