Diverse fixes for UI basis