Misc tweeks
Moved Slatwall specific logic out of Hibachi
Updated some old slatwall references.