fixes. add task delay check, layout fixes