Change click handlers to use self instead of hardcoded instance name