Added form class and moved creation methods to there