cleanup
styled forms a bit
moved model to own file