Remove type:link, and updated the design a little bit (not complete)