Changes to dialogs and fix fro FireFoz download issue