Removed unnecessary xib files; some cleanup
A little more cleanup
Collection View kind of working