Form xml had been forgot on the last commit... now all xmls are refactor