Updates to Sam's code to ensure the navigation drawer is present and
back buttons perform navigation correctly