Restructured tasks layout