Updated to v0.13 layout to match latest header location changes