Fix View handling + namespacing issues