Added some dialogs and additional functions