clean up various view logic
delete old files, add class properties
fix tests