Fixed #51. Updated functionality to reflect new html ids