fix views
fix views
update models and controllers