Issue fixes

Stopped working because of changes in website DOM structure. Updating to
reflect those changes.