Some UI changes and API bug fixes