DEVIDM-98: Various view fixes