Moved forms to own file