Starting to work on deep linking and stabilizing the view control