updated borriwing views
merging
Fixed migration issue