Started on general list, layout update