Fix bug with scrollbar
Update db and views