Refactoring forms, various changes