Lots of formatting changes; Ready to push live again