fix view changes. make sure unittessts pass.