Renamed files, added layouts for list items