Client - Inline editor - Fixed focus problem and code cleanup