BASIC-719 | Updated Views