Changed ListView to simpler version