finishing stuff
resolved conflicts
Merge pull request #60 from dvicini/master

some finishing work, ordering of view classes