Updated some markup and js