Implemented the onclick listeners, needs testing with AVD