Improved states & Finding Encryption keys modal