Fix packages and click binding