more responsive and template tweaks