Added working URLs and better scrolling positions