Issue #401 - adding buttons and their onclick methods