Added navigation controller and shape family VC