Added listadapter, refactored