Bugs fixed

Button onClick callbacks are still not working...