More UI-behaviour-related cahnges.