PEP 8 Fixed
rewritten views, fixed more pep 8 errors, deleted unnecessary lines and files
Merge branch 'dev'