Small bug fix
Code cleaning; Show some text in list when the list is empyt