Changed some markup and javascript.