Move out of nav controllers and fix logout linking