fixes to A element and click handler