Fixes done to views and tasks