Dao - fix more UI for target 5.0