JButton listners were updated to avoid hardcoding