Template reworking, editing and articles done