Trying turning buttons into models

Change-Id: I66b2b561266278f01b205a828ad3511a703784b7
Closes-Task: #PRD-2505
Merge "Trying turning buttons into models"