Some convergence with damping factor
Shuffled gui files around and modified Model