Templates fixed.
Final touchups