Fixed images, added static tags - to be fixed