Use better require/jquery

Change-Id: Ia7947b02370da71afa5477a71a6f9a15164079bb