Move a few tweaks from the live site back.
Move a few tweaks from the live site back.


Former-commit-id: 5f2ede7a7427a04bf81f78f09a42398187ca701d [formerly 3f00ccc23083240a44e50481834cb54d3e0ba5e2] [formerly 123c7bb8a98f359ed526383d8cafc9933c1d3168]
Former-commit-id: 02c6098af04d18a4a3d936efff9836ed42008bb1 [formerly 26bc654ca28bccea2ba342cb229a2ce1593496ac]
Former-commit-id: e36b1f6d942f9e59ed24749e5fb23a8e11ce375d
ryansb/ofCourse,sctjkc01/ofCourse,sctjkc01/ofCourse,ritjoe/ofCourse,ritjoe/ofCourse,ryansb/ofCourse