Added List titles, refactored naming and more.