Small visual fixes
Separated the rest of the model from the view classes + small graphical fixes