code clean and add new collection view