Naming and cleanup

Deleted old difficulty window. Renamed new difficulty form to
DifficultyForm