Ajay/Melanie | #2981 | Added styling
Ajay/Melanie | #2981 | Refactoring - ViewModel not aware of cache