Starting to add addin structure and also preloading of images to improve user experience