Fix bug
Update views