added jquery expander
fixing conflicts