Bug Fix - Refactor for patient view classes into common - Trello 184