code cleanup, new design
Merge remote-tracking branch 'remotes/origin/master' into js