Added thumbnail-borders, added alternatives (imgs), some validation fixes