Revert "Revert "Improved task row""

This reverts commit 899df95a263732bb7969afe697afee4bf5bf9a5f.