UI: final bugfixing.