fix bug layouting & js