added .listenTo() and small refactor to collection view