diff --git a/package.json b/package.json
index a41ff28..cc824a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minibits_wallet",
-  "version": "0.1.9-beta.19",
+  "version": "0.1.9-beta.20",
   "private": true,
   "scripts": {
     "android:clean": "cd android && ./gradlew clean",
diff --git a/src/components/MemoInputCard.tsx b/src/components/MemoInputCard.tsx
index 954f404..e991b19 100644
--- a/src/components/MemoInputCard.tsx
+++ b/src/components/MemoInputCard.tsx
@@ -4,6 +4,7 @@ import {spacing, useThemeColor} from '../theme'
 import {Button} from './Button'
 import {Card} from './Card'
 import {translate} from '../i18n'
+import { verticalScale } from '@gocodingnow/rn-size-matters'
 
 interface MemoInputProps {
   memo: string
@@ -67,17 +68,17 @@ const $memoContainer: ViewStyle = {
 
 const $memoCard: ViewStyle = {
   marginBottom: spacing.small,
-  minHeight: 80,
+  minHeight: verticalScale(80),
 }
 
 const $memoButton: ViewStyle = {
-  maxHeight: 50,
+  maxHeight: verticalScale(50),
 }
 
 const $memoInput: TextStyle = {
   flex: 1,
   borderRadius: spacing.small,
-  fontSize: 16,
+  fontSize: verticalScale(16),
   textAlignVertical: 'center',
   marginRight: spacing.small,
 }
diff --git a/src/i18n_messages/en.json b/src/i18n_messages/en.json
index 8453b76..76935f9 100644
--- a/src/i18n_messages/en.json
+++ b/src/i18n_messages/en.json
@@ -50,6 +50,7 @@
 		"copyFailParam": "Couldn't copy %{param}",
 		"create": "Create",
 		"disabled": "Disabled",
+		"edit": "Edit",
 		"enabled": "Enabled",
 		"hideMore": "Collapse",
 		"import": "Import",
@@ -142,7 +143,7 @@
 		"resetDescription": "This will wipe out all local data from storage and from the local database. Do only during development or testing.",
 		"title": "Developer options",
 		"transactions": "Sync recent transactions",
-		"transactionsDescription": "There are {{count}} recent transactions cached in the app's fast storage. Resetting will reload them from the app's database. Do only during development or testing."
+		"transactionsDescription": "There are %{count} recent transactions cached in the app's fast storage. Resetting will reload them from the app's database. Do only during development or testing."
 	},
 	"errorScreen": {
 		"friendlySubtitle": "Unfortunately, the Minibits app encountered an unexpected error. Please contact us at support@minibits.cash or raise an issue on Github.",
@@ -293,7 +294,7 @@
 	"privateKey": "Private key",
 	"privateNotePlaceholder": "Your private note",
 	"profileMissingAddressError": "Missing address",
-	"profileMissingNostrAddress": "This profile does not have nostr address to send ecash to.",
+	"profileMissingNostrAddress": "This profile does not have a Nostr address.",
 	"profileOnboarding": {
 		"desc": "Your minibits.cash wallet address allows you to receive encrypted ecash over Nostr. Simultaneously, it serves as your Lightning address, enabling you to receive payments from any Lightning wallet or zaps on the Nostr social network.",
 		"minibitsDesc": "Share your wallet address to receive encrypted ecash over Nostr. This also serves as your Lightning address, enabling you to receive payments from any Lightning wallet or zaps on the Nostr social network.",
@@ -318,8 +319,8 @@
 	"receiveScreen": {
 		"memoFromSender": "Memo from sender",
 		"newMintsAdded": {
-			"one": "{{count}} mint has been added to your wallet",
-			"other": "{{count}} mints have been added to your wallet"
+			"one": "%{count} mint has been added to your wallet",
+			"other": "%{count} mints have been added to your wallet"
 		},
 		"pasteoReceiveDescription": "Paste ecash token to receive it into your wallet.",
 		"pasteToReceive": "Paste",
@@ -419,8 +420,8 @@
 		"devOptions": "Developer options",
 		"go": "Let's go!",
 		"mintsCount": {
-			"one": "{{count}} mint",
-			"other": "{{count}} mints"
+			"one": "%{count} mint",
+			"other": "%{count} mints"
 		},
 		"preferredUnit": "Preferred unit",
 		"exchangeCurrency": "Balance conversion",
diff --git a/src/screens/ContactDetailScreen.tsx b/src/screens/ContactDetailScreen.tsx
index 8f49e3f..e5ccb1b 100644
--- a/src/screens/ContactDetailScreen.tsx
+++ b/src/screens/ContactDetailScreen.tsx
@@ -111,7 +111,6 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
             ? noteInputRef.current.focus()
             : false
         }, 100)
-
     }
 
     const onCopyNpub = function () {        
@@ -155,7 +154,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
     const saveToPrivateContacts = async function () {
         if(contact.type === ContactType.PUBLIC) {            
             contactsStore.addContact({...contact})
-            toggleContactModal()            
+            setIsContactModalVisible(false)            
             setInfo('Contact saved.')
         }
     }
@@ -183,7 +182,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
     const {type, name, display_name, npub, nip05, picture, about, lud16} = contact
     
     return (
-      <Screen contentContainerStyle={$screen} preset='auto'>        
+      <Screen contentContainerStyle={$screen} preset='scroll'>
         <View style={[$headerContainer, {backgroundColor: headerBg}]}>            
             {picture ? (
                 <View style={{borderRadius: 48, overflow: 'hidden'}}>
@@ -212,7 +211,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
                 />
             ) : (
                 <Card
-                    style={[$card, {minHeight: 80}]}
+                    style={[$card, {minHeight: verticalScale(80)}]}
                     ContentComponent={
                         <View style={$noteContainer}>    
                             <TextInput
@@ -253,18 +252,18 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
                     }
                 />
             )}
+            {lud16 && (
             <Card
-                style={[$card, {marginTop: spacing.small}]}                
+                labelTx='lightningAddress'
+                style={$card}
+                labelStyle={{marginTop: spacing.small}}                
                 ContentComponent={
-                    <>
-                    {lud16 && (
+                    <>                        
                         <ListItem                                    
-                            text={lud16}
-                            subTx='lightningAddress'                  
-                            leftIcon='faBolt'
-                            leftIconColor={colors.palette.orange200}                          
-                        />
-                        )}
+                                text={lud16}                                
+                                leftIcon='faBolt'
+                                leftIconColor={colors.palette.orange200}                          
+                        />                        
                         <ListItem                                                                
                             LeftComponent={
                                 <Button
@@ -275,7 +274,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
                                     preset='tertiary'
                                 />
                             }
-                            RightComponent={lud16 ? (
+                            RightComponent={
                                 <Button
                                     tx="payCommon.payToAddress"
                                     style={{marginLeft: spacing.small, alignSelf: 'center', minHeight: verticalScale(20)}}
@@ -283,14 +282,24 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
                                     onPress={gotoTransfer}
                                     preset='tertiary'
                                 />
-                            ) : undefined}
-                            topSeparator={lud16 ? true : false}                             
+                            }
+                            topSeparator
                         />                        
                     </>
                 }
-            />            
+            />
+            )}            
         </View>
         <View style={[$bottomContainer]}>
+            {type === ContactType.PUBLIC &&  contact.nip05 && (                
+                <Button
+                    tx="saveContactPrivate"   
+                    style={{marginLeft: spacing.small, alignSelf: 'center', minHeight: verticalScale(20)}}
+                    textStyle={{fontSize: verticalScale(14), lineHeight: verticalScale(16)}}                                     
+                    onPress={saveToPrivateContacts}
+                    preset='tertiary'                    
+                />
+            )}
             <View style={$buttonContainer}>
                 {contact.nip05 ? (
                     <Button
@@ -352,7 +361,7 @@ export const ContactDetailScreen: FC<ContactDetailScreenProps> = observer(
                     />
                 </>
             )}
-            {type === ContactType.PUBLIC && (                
+            {type === ContactType.PUBLIC &&  contact.nip05 && (                
                 <ListItem
                     tx="saveContactPrivate"
                     subText={translate('saveContactPrivateDesc', { nip05: contact.nip05 })}
@@ -401,15 +410,15 @@ const $noteContainer: ViewStyle = {
 const $noteInput: TextStyle = {
     flex: 1,
     borderRadius: spacing.small,
-    fontSize: 16,
+    fontSize: verticalScale(16),
     textAlignVertical: 'center',
-    marginRight: spacing.small,
+    marginRight: spacing.small,    
 }
 
 
 const $noteButton: ViewStyle = {
-    maxHeight: 50,
-    minWidth: 70,
+    maxHeight: verticalScale(50),
+    minWidth: verticalScale(70),
 }
 
 
@@ -437,7 +446,7 @@ const $qrCodeContainer: ViewStyle = {
 }
 
 const $card: ViewStyle = {
-    // marginVertical: 0,
+    paddingVertical: 0,
 }
 
 const $item: ViewStyle = {
diff --git a/src/screens/ExportBackupScreen.tsx b/src/screens/ExportBackupScreen.tsx
index c6e1b55..966ff3f 100644
--- a/src/screens/ExportBackupScreen.tsx
+++ b/src/screens/ExportBackupScreen.tsx
@@ -63,21 +63,24 @@ export const ExportBackupScreen: FC<ExportBackupScreenProps> =
     useEffect(() => {
         const loadProofs = async () => {            
             setIsLoading(true)
-
-            // fix if rootStore migration failed and some proofs are missing urls
-            if (proofsStore.allProofs.some(proof => proof.mintUrl.length === 0 )) {
-              for (const mint of mintsStore.allMints) {
-                for(const keysetId of mint.keysetIds) {
-                    Database.updateProofsMintUrl(keysetId, mint.mintUrl)
-                }                
+            try {
+              // fix if rootStore migration failed and some proofs are missing urls
+              if (proofsStore.allProofs.some(proof => proof.mintUrl.length === 0 )) {
+                for (const mint of mintsStore.allMints) {
+                  for(const keysetId of mint.keysetIds) {
+                      Database.updateProofsMintUrl(keysetId, mint.mintUrl)
+                  }                
+                }
               }
-            }
 
-            // full refresh of proofs from DB in case the state is broken
-            await proofsStore.loadProofsFromDatabase()
+              // full refresh of proofs from DB in case the state is broken
+              await proofsStore.loadProofsFromDatabase()
 
-            // log.trace('[loadProofs]', {refreshedProofs: proofsStore.proofs})
-            setIsLoading(false)
+              // log.trace('[loadProofs]', {refreshedProofs: proofsStore.proofs})
+              setIsLoading(false)
+            } catch (e: any) {
+              handleError(e)
+            }            
         }
 
         loadProofs()
@@ -480,15 +483,15 @@ export const ExportBackupScreen: FC<ExportBackupScreenProps> =
             <View style={{
                 flexDirection: 'row', 
                 alignItems: 'center', 
-                marginBottom: spacing.small,
-                marginRight: spacing.small
+                marginBottom: spacing.small,     
+                paddingRight: spacing.medium           
               }}
             >
               <Icon icon='faInfoCircle' />
               <Text 
-                style={{color: hint, flexWrap: 'wrap'}} 
+                style={{color: hint}} 
                 size='xs' 
-                text='You still need your seed phrase when using this backup to recover wallet.'
+                text='You will still need your seed phrase when using this backup to recover your wallet.'
               />
             </View>
             <View style={$buttonContainer}>              
@@ -572,6 +575,5 @@ const $rightContainer: ViewStyle = {
 }
 
 const $bottomContainer: ViewStyle = { 
-  marginBottom: spacing.medium,
-  
+  marginHorizontal: spacing.medium,  
 }
diff --git a/src/screens/TranDetailScreen.tsx b/src/screens/TranDetailScreen.tsx
index 80bef76..4774935 100644
--- a/src/screens/TranDetailScreen.tsx
+++ b/src/screens/TranDetailScreen.tsx
@@ -79,11 +79,10 @@ export const TranDetailScreen: FC<TransactionsStackScreenProps<'TranDetail'>> =
       ProofsByStatus | undefined
     >(undefined)*/
     const [error, setError] = useState<AppError | undefined>()
-    const [isNoteModalVisible, setIsNoteModalVisible] = useState<boolean>(false)
+    const [isNoteEditing, setIsNoteEditing] = useState(transaction?.noteToSelf ? false : true)
     const [isDataParsable, setIsDataParsable] = useState<boolean>(true)    
     const [info, setInfo] = useState('')
-    const [note, setNote] = useState<string>('')
-    const [savedNote, setSavedNote] = useState<string>('')
+    const [note, setNote] = useState<string>('')    
     const [mint, setMint] = useState<Mint | undefined>()
     const [isAuditTrailVisible, setIsAuditTrailVisible] = useState<boolean>(false)
 
@@ -96,7 +95,7 @@ export const TranDetailScreen: FC<TransactionsStackScreenProps<'TranDetail'>> =
       try {
         const {id} = route.params        
         const tx = transactionsStore.findById(id)
-        log.trace('Transaction loaded', {id: tx?.id, unit: tx?.unit})
+        log.trace('Transaction loaded', {id: tx?.id, unit: tx?.unit, note: tx?.noteToSelf})
 
       if (!tx) {
           throw new AppError(
@@ -116,45 +115,36 @@ export const TranDetailScreen: FC<TransactionsStackScreenProps<'TranDetail'>> =
         setMint(mintInstance)
       }
 
+      if(tx.noteToSelf) {
+        setNote(tx.noteToSelf)
+      }
+      
       setTransaction(tx as Transaction)
       } catch (e: any) {
         handleError(e)
       }
     }, [route]))
-    
 
-    useEffect(() => {
-      const focus = () => {
-        noteInputRef && noteInputRef.current
-          ? noteInputRef.current.focus()
-          : false
-      }
-
-      if (isNoteModalVisible) {
-        setTimeout(() => focus(), 100)
-      }
-    }, [isNoteModalVisible])
 
-
-
-  const toggleNoteModal = function () {
-      if (isNoteModalVisible) {
-        setIsNoteModalVisible(false)
-      } else {
-        setIsNoteModalVisible(true)
-      }
-    }
-
-    const saveNote = async function () {
-      try {
-        setIsNoteModalVisible(false)
+    const onNoteSave = async function () {
+      try {        
         transaction!.setNote(note)
-        setSavedNote(note)
+        setIsNoteEditing(false)        
       } catch (e: any) {
         handleError(e)
       }
     }
 
+    const onNoteEdit = function () {        
+      setIsNoteEditing(true)
+
+      setTimeout(() => {
+          noteInputRef && noteInputRef.current
+          ? noteInputRef.current.focus()
+          : false
+      }, 100)
+    }
+
     const copyAuditTrail = function () {
       try {        
         if(transaction) Clipboard.setString(JSON.stringify(getAuditTrail(transaction)))
@@ -179,9 +169,8 @@ export const TranDetailScreen: FC<TransactionsStackScreenProps<'TranDetail'>> =
       }
     }
 
-    const handleError = function (e: AppError): void {
-      setIsNoteModalVisible(false)
-      setError(e)
+    const handleError = function (e: AppError): void {      
+      setError(e)      
     }
 
 
@@ -238,31 +227,44 @@ export const TranDetailScreen: FC<TransactionsStackScreenProps<'TranDetail'>> =
               <Card
                 style={$actionCard}
                 ContentComponent={
-                  <>
-                    <ListItem
-                      text={
-                        transaction.noteToSelf
-                          ? transaction.noteToSelf
-                          : savedNote
-                          ? savedNote
-                          : translate("tranDetailScreen.addYourNote")
-                      }
-                      LeftComponent={
-                        <Icon
-                          containerStyle={$iconContainer}
-                          icon="faPencil"
-                          size={spacing.medium}
-                          color={iconColor}
+                    <View style={$noteContainer}>    
+                        <TextInput
+                            ref={noteInputRef}
+                            onChangeText={note => setNote(note)}                                    
+                            value={`${note}`}
+                            style={$noteInput}
+                            onEndEditing={onNoteSave}
+                            maxLength={200}
+                            keyboardType="default"
+                            selectTextOnFocus={true}
+                            placeholder={translate("privateNotePlaceholder")}
+                            editable={
+                                isNoteEditing
+                                ? true
+                                : false
+                            }
                         />
-                      }
-                      style={$item}
-                      // bottomSeparator={true}
-                      onPress={toggleNoteModal}
-                    />
-                  </>
+                        {isNoteEditing ? (
+                            <Button
+                                preset="secondary"
+                                style={$noteButton}
+                                tx="common.save"
+                                onPress={onNoteSave}
+                                
+                            />
+                        ) : (
+                            <Button
+                                preset="secondary"
+                                style={$noteButton}
+                                tx="common.edit"
+                                onPress={onNoteEdit}
+                                
+                            />
+                        )}
+                    
+                    </View>
                 }
               />
-
               {transaction.type === TransactionType.RECEIVE && (
                 <ReceiveInfoBlock
                   transaction={transaction}
@@ -402,66 +404,10 @@ export const TranDetailScreen: FC<TransactionsStackScreenProps<'TranDetail'>> =
                   </>
                   }
                 />
-              )}
-              {/*proofsByStatus && (
-                <Card
-                  labelTx='tranDetailScreen.backedUpEcash'
-                  style={$dataCard}
-                  ContentComponent={
-                    <>
-                      <JSONTree
-                        hideRoot
-                        data={proofsByStatus}
-                        theme={{
-                          scheme: 'default',
-                          base00: '#eee',
-                        }}
-                        invertTheme={colorScheme === 'light' ? false : true}
-                      />
-                    </>
-                  }
-                  FooterComponent={
-                    <Button
-                        preset="tertiary"
-                        onPress={() => copyBackupProofs(proofsByStatus)}
-                        tx="common.copy"
-                        style={{
-                            minHeight: 25,
-                            paddingVertical: spacing.extraSmall,
-                            marginTop: spacing.small,
-                            alignSelf: 'center',
-                        }}
-                        textStyle={{fontSize: 14}}
-                    />  
-                  }
-                />
-              )*/}
+              )}              
             </View>
           </>
-        )}
-        <BottomModal
-          isVisible={isNoteModalVisible}
-          ContentComponent={
-            <View style={$noteContainer}>
-              <Text tx="tranDetailScreen.addYourNote" preset="subheading" />
-              <View style={{flexDirection: 'row', alignItems: 'center'}}>
-                <TextInput
-                  ref={noteInputRef}
-                  onChangeText={note => setNote(note)}
-                  value={note}
-                  style={[$noteInput, {backgroundColor: inputBg}]}
-                  maxLength={200}
-                />
-                <Button
-                  tx="common.save"
-                  onPress={saveNote}
-                />
-              </View>
-            </View>
-          }
-          onBackButtonPress={toggleNoteModal}
-          onBackdropPress={toggleNoteModal}
-        />
+        )}        
         {error && <ErrorModal error={error} />}
         {info && <InfoModal message={info} />}
       </Screen>
@@ -1919,6 +1865,7 @@ const $headerContainer: TextStyle = {
 const $contentContainer: TextStyle = {
     // flex: 1,
     padding: spacing.extraSmall,
+    marginTop: -spacing.extraLarge * 1.5,
 }
 
 const $tranAmount: TextStyle = {
@@ -1928,9 +1875,9 @@ const $tranAmount: TextStyle = {
 }
 
 const $actionCard: ViewStyle = {
-    marginBottom: spacing.extraSmall,
-    marginTop: -spacing.extraLarge * 1.5,
+    marginBottom: spacing.extraSmall,    
     paddingVertical: 0,
+    minHeight: verticalScale(80)
 }
 
 const $dataCard: ViewStyle = {
@@ -1939,31 +1886,24 @@ const $dataCard: ViewStyle = {
     // paddingTop: spacing.extraSmall,
 }
 
-const $item: ViewStyle = {
-    paddingHorizontal: spacing.small,
-    paddingLeft: 0,
-}
-
-
-const $iconContainer: ViewStyle = {
-    padding: spacing.extraSmall,
-    alignSelf: 'center',
-    marginRight: spacing.medium,
+const $noteContainer: ViewStyle = {
+  flex: 1,
+  flexDirection: 'row',
+  justifyContent: 'center',
+  alignItems: 'center',
 }
 
-const $noteContainer: TextStyle = {
-    padding: spacing.small,
-    alignItems: 'center',
+const $noteButton: ViewStyle = {
+  maxHeight: verticalScale(50),
+  minWidth: verticalScale(70),
 }
 
 const $noteInput: TextStyle = {
-    flex: 1,
-    margin: spacing.small,
-    borderRadius: spacing.extraSmall,
-    fontSize: 16,
-    padding: spacing.small,
-    alignSelf: 'stretch',
-    textAlignVertical: 'top',
+  flex: 1,
+  borderRadius: spacing.small,
+  fontSize: verticalScale(16),
+  textAlignVertical: 'center',
+  marginRight: spacing.small,  
 }
 
 const $buttonContainer: ViewStyle = {
diff --git a/src/screens/TranHistoryScreen.tsx b/src/screens/TranHistoryScreen.tsx
index 9909952..0163619 100644
--- a/src/screens/TranHistoryScreen.tsx
+++ b/src/screens/TranHistoryScreen.tsx
@@ -398,7 +398,8 @@ export const TranHistoryScreen: FC<TransactionsStackScreenProps<'TranHistory'>>
                       count: erroredDbCount
                     })}
                     leftIcon='faBug'                            
-                    onPress={onDeleteErrored}                                      
+                    onPress={onDeleteErrored}
+                    bottomSeparator={true}                                    
                 />
                 <ListItem
                     tx="tranHistory.deleteReverted"
diff --git a/src/screens/Transactions/TransactionListItem.tsx b/src/screens/Transactions/TransactionListItem.tsx
index 6ef7546..34a073b 100644
--- a/src/screens/Transactions/TransactionListItem.tsx
+++ b/src/screens/Transactions/TransactionListItem.tsx
@@ -53,25 +53,25 @@ export const TransactionListItem = observer(function (
             return translate('transactionCommon.from', {sender: getProfileName(tx.sentFrom)}).slice(0, 30)
           }
         } else {
-          return tx.memo ? tx.memo : translate('transactionCommon.youReceived')
+          return tx.memo ? tx.memo.slice(0, 30) : translate('transactionCommon.youReceived').slice(0, 30)
         }
       case TransactionType.SEND:
         return (tx.memo
           ? tx.memo.slice(0, 30)
           : tx.sentTo
-          ? translate('transactionCommon.sentTo', {receiver: getProfileName(tx.sentTo)})
+          ? translate('transactionCommon.sentTo', {receiver: getProfileName(tx.sentTo)}).slice(0, 30)
           : translate('transactionCommon.youSent')).slice(0, 30)
       case TransactionType.TOPUP:
         return (tx.memo
           ? tx.memo.slice(0, 30)
           : tx.sentFrom
-          ? translate('transactionCommon.receivedFrom', {sender: getProfileName(tx.sentFrom)})
+          ? translate('transactionCommon.receivedFrom', {sender: getProfileName(tx.sentFrom)}).slice(0, 30)
           : translate('transactionCommon.youReceived')).slice(0, 30)
       case TransactionType.TRANSFER:
         return (tx.memo && tx.memo !== 'LNbits'
           ? tx.memo.slice(0, 30)
           : tx.sentTo
-          ? translate('transactionCommon.paidTo', {receiver: getProfileName(tx.sentTo)})
+          ? translate('transactionCommon.paidTo', {receiver: getProfileName(tx.sentTo)}).slice(0, 30)
           : translate('transactionCommon.youPaid')).slice(0, 30)
       default:
         return translate('transactionCommon.unknown')