Minor changes to get buttons to work.