removed extra inc files, updated page templates