Merge pull request #167 from jfn6030217/asf-site-whimsy-fixes

SPOT-299 Asf site whimsy fixes