Adjust JS layout
Fix baseUrl for requirejs