Refactor FO inline editing