Added buttons events (again)

Now the solution can build