Optimization and Implementation of bonus counter / buttons

[paulpaterson]

Some performance optimization and a new bonus counter + bonus buttons. The buttons don't do anything yet.