Working active view, again.

Also mesing with push -u.