More work on content list