Forms refactoring
Forms refactoring 2