Task create layout
MInor fixes in layout