Some UI and delays fixes