Changed organizers to nested collection
View cleanup and CSS changes