added js style fades and what not
Merge remote-tracking branch 'origin/layout'