Adjust margins so AFR calendar category doesn't overlap title
Merge branch 'refs/heads/master' into test