Updated header to include logo, since it happens almost ALL the time
Reworked Shortcodes factory to consolidate code and allow custom html atts and classes