Added UI and adjusted the datasource