Bug on event deletion

The conditions causing the raising exception on event deletion were removed.

Additional refactoring were done to improve user experience while working with disabled buttons