Added some scrolls to improve the UX