Attempts at fixing flicker

Also adds double-clicking to edit a mapping.