2 extra helpers and cleaner templates

Added 2 helpers for keeping the templates clean.
Also did some html indenting.

The helpers are replacing some logic which was defined in the templates.