Updated UI
Fixed Future resolution