Further updates
Fixing views