Ajay | #3989 | Fixing my ds page after refactoring