Style fixes

Caption before label or LaTeX goes bonkers