Moved external js
And some more work has been done