Changed arrangement of action listener