resolve some auto layout issues
Completed the basic nav checkpoint