Moved all JS to main,js