feat(view) - address review comments