Made views OOP again
Fixed broken ?: