No more inline js
No more inline js
Fix merge
Code cleanup