many fixes in views adn models