Update: Better view controller management.