Added messages support in views & other changes