Minor changes to Action and GUI