Fix layout of upcoming task block, fix cookie bug.