Added navigation, and ability for users to leave device where it is