Updated task layout