UI updates
fixes and disabled API for now