Changes to support DR
UI Fix