fixed captions, added picture border