More general cleanup and copied the new version of the cabinet render function into the rowview. close #373