Added buttons handling.
Updated version