Lots of fixes with displaying of task