Tweaks on the views