Fix bug with empty name
Update comment blocks and fix click events