v1.0

Upto cleaning up views