Feature/restore unobtrusive js