Updated view for #68
Implemented #68
Merge remote-tracking branch 'LitusProject/dev-cudi'