pre commit cleanup
resolved conflicts
fixed product filtering
troubleshoot side nav
troubleshoot side nav
added back in code that was commented out for testing purposes