Updated for new features

-- back button functionality
-- deep linking