updated UI and a couple of things in API