Refactoring form layout