R&D UI rework