Fixing layout, js and setup.py