Adjust UI and update API