fix moc and ui again