better rendering v14, improved click logic