Tried updating with correct views
Integrated correct views with updatated database
fixed notification model
 fixed user model
Half merge
fully merged