Restored New Encounter button.
Removed unused code.