New Changes

Tested changes on views.