refactor view data model, update styling corners