Changed UI to ListView
Better ListView implementation