Improve customize Taskviewlayout
Merge && Cleanup