re-org for use with node and add home view