Minor formatting changes, and changed order of Javascript asset pipeline