fixed lists and changed layouts