add viewport tag
complete merge