Distribution of logic between the functions.
Pep8 fix, some fix in html, change README
Merge branch 'testing' into classview