Fixed scrolling refresh and cleaned code