views and models minor fixes