Fixed Button / UI Events problem.
Merge branch 'leif7' into rc