rearrange DOM layout a bit
Merge branch 'jquery' into backbone-1