[master] Separate javascript from html