WIP #39

Improve the design of main list