Tweaks to CECP theme; pgfplots layout trick