Updated design and add marked lists