Added UI and API integration