add viewport
Merge branch 'mariko'