removed useless spans, added jquery expander (still doesn't look good)