Add a bug with navigation controllers
Add a bug with switching UICollectionView layouts