FIX - views fixed