Adding estate number of views
Fixing some stuff