fixed scrolling issues plus added markers check