Better JS

More dynamic Javascript
Better layout