Full rewrite of the resource base view