Readded hgroup until I can work out styling quirks