Rework the stylesheet and content organization, based on previous template