More style/template changes, in progress.