redesign, js fix
Merge thing