Two finals down, two to go.

More template editing to come, so if something looks odd, it'll more than likely be fixed soon.