click fixes, style fixes