redesign of the UI, based on the latest code.