start of UI rework