Code Update
Merge branch 'Design' of https://github.com/stuartshay/NavigatorEndPoint into Design