Fix/list view design