several fixes for UI problems