Small transition fixes now that we're not using
a navigation vc