behavior and view fixes