move inline edit inside subject form, improve design, refactoring