Download and Show modal improvements