Minor changes to button handling, still not working as expected.