Added NavCtrl and removed some phoneCat components