Added some Dialogs and added new Exception structure
Removed not needed code