Forms refactoring 3
Forms refactoring 4