Simplifying markup; adding archive page & nav include