Template fixes, reference variable as @variable.

Cleaning up the remaining ERB warnings when using variables without proper notation.