Button class updated

buttons are now moved along. Also, each button has its own ID to make
identification simpler.