fix views and models