Change a bit on image sizes
Change back to old struture