Chg: layout and js
Chg: merge