Firmware: Fixed and improved the workflow. Allow to close the modal.