Fix some bugs, try out lazyload of images