Update project

Merged libs into a single one.
Better handling of clicks.