Use second navigation controller

Add more comments