fixed few errors in Crypto, more work on the ui