Fix issue #1 + Hide events button first try