Tidying up code, removed the restricting table layout in viewtask