Pages changed to code. Added navigation controller and PageFactory