design: improved layout, caption