Refactors Form block and Config model