fiz bugs and add inline import of views