Fix models and view