Refactoring and cleaning forms layout.