added all view controller, fixed navigation