More radical UI reworking.