bug fixes
view changes