Added "Export To Excel" Action. Minor refactoring