WIP: refactor for view partial