template tags, tweaks, re-fix imgs