Moved form class and rebuilt models to include default settings and improved methods in them