cleanup
view fixes