Rename buttons

Also attempt to add generic onClick listener.
It isn't working right now. Need to figure that out :(

Signed-off-by: Prashant Malani <p.malani@gmail.com>