fixed navigation ; added collection view for production