step 4/5 & fix scrollbar