fix view
fix translation
fix view
fix view
merge
merge