Minor tweaks to layout; moved comment loading out of template