Few tweaks to two views