Added another ActionListener, made some variables private