Fixed image caption and border. close #13