background-color added, not needed code removed
clean up code, AND OR selection for types and years implemented; setup layout