Fix to UI and removed some debug outputs.