Fixed buttons and listeners, tweaked Intent creation.