solved merged confilicts
added header styling
fixed undefined bug on tasks template
slove merge conflict