diff --git a/app/client/mobile/src/contacts/Contacts.styled.ts b/app/client/mobile/src/contacts/Contacts.styled.ts
index cb339b7f..47f7869c 100644
--- a/app/client/mobile/src/contacts/Contacts.styled.ts
+++ b/app/client/mobile/src/contacts/Contacts.styled.ts
@@ -1,4 +1,5 @@
 import {StyleSheet} from 'react-native';
+import { Colors } from '../constants/Colors';
 
 export const styles = StyleSheet.create({
   contacts: {
@@ -62,6 +63,10 @@ export const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
   },
+  noneLabel: {
+    fontSize: 20,
+    color: Colors.placeholder,
+  },
   cards: {
     display: 'flex',
     flexDirection: 'column',
diff --git a/app/client/mobile/src/contacts/Contacts.tsx b/app/client/mobile/src/contacts/Contacts.tsx
index e60c3202..93af1206 100644
--- a/app/client/mobile/src/contacts/Contacts.tsx
+++ b/app/client/mobile/src/contacts/Contacts.tsx
@@ -188,7 +188,11 @@ export function Contacts({openRegistry, openContact}: {openRegistry: () => void;
           keyExtractor={card => card.cardId}
         />
       )}
-      {state.filtered.length === 0 && <Text style={styles.none}>{state.strings.noContacts}</Text>}
+      {state.filtered.length === 0 && (
+        <View style={styles.none}>
+          <Text style={styles.noneLabel}>{state.strings.noContacts}</Text>
+        </View>
+      )}
       <Confirm show={alert} params={alertParams} />
     </View>
   );
diff --git a/app/client/mobile/src/conversation/Conversation.styled.ts b/app/client/mobile/src/conversation/Conversation.styled.ts
index ee29943d..2ad64134 100644
--- a/app/client/mobile/src/conversation/Conversation.styled.ts
+++ b/app/client/mobile/src/conversation/Conversation.styled.ts
@@ -28,6 +28,10 @@ export const styles = StyleSheet.create({
     marginBottom: 0,
     backgroundColor: 'transparent',
   },
+  border: {
+    width: '100%',
+    height: 2,
+  },
   header: {
     display: 'flex',
     flexDirection: 'row',
diff --git a/app/client/mobile/src/conversation/Conversation.tsx b/app/client/mobile/src/conversation/Conversation.tsx
index f5d39ee5..b1e53538 100644
--- a/app/client/mobile/src/conversation/Conversation.tsx
+++ b/app/client/mobile/src/conversation/Conversation.tsx
@@ -33,6 +33,11 @@ export function Conversation({close}: {close: ()=>void}) {
     }
   }
 
+  const onClose = () => {
+    actions.close();
+    close();
+  }
+
   const onContent = (width, height) => {
     const currentLead = state.topics.length > 0 ? state.topics[0].topicId : null;
     if (scrolled.current) {
@@ -66,7 +71,7 @@ export function Conversation({close}: {close: ()=>void}) {
       <SafeAreaView style={styles.header}>
         {close && (
           <View style={styles.iconSpace}>
-            <IconButton style={styles.back} compact="true" mode="contained" icon="arrow-left" size={28} onPress={close} />
+            <IconButton style={styles.back} compact="true" mode="contained" icon="arrow-left" size={28} onPress={onClose} />
           </View>
         )}
         <View style={styles.title}>
diff --git a/app/client/mobile/src/registry/Registry.styled.ts b/app/client/mobile/src/registry/Registry.styled.ts
index 1f1c132a..01a8703e 100644
--- a/app/client/mobile/src/registry/Registry.styled.ts
+++ b/app/client/mobile/src/registry/Registry.styled.ts
@@ -1,4 +1,5 @@
 import {StyleSheet} from 'react-native';
+import { Colors } from '../constants/Colors';
 
 export const styles = StyleSheet.create({
   registry: {
@@ -71,6 +72,10 @@ export const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
   },
+  noneLabel: {
+    fontSize: 20,
+    color: Colors.placeholder,
+  },
   cards: {
     display: 'flex',
     flexDirection: 'column',
diff --git a/app/client/mobile/src/registry/Registry.tsx b/app/client/mobile/src/registry/Registry.tsx
index 1e22a11c..9e55e16c 100644
--- a/app/client/mobile/src/registry/Registry.tsx
+++ b/app/client/mobile/src/registry/Registry.tsx
@@ -83,7 +83,11 @@ export function Registry({close, openContact}: {close: () => void; openContact:
           keyExtractor={profile => profile.guid}
         />
       )}
-      {state.profiles.length === 0 && <Text style={styles.none}>{state.strings.noContacts}</Text>}
+      {state.profiles.length === 0 && (
+        <View style={styles.none}>
+          <Text style={styles.noneLabel}>{state.strings.noContacts}</Text>
+        </View>
+      )}
     </View>
   );
 }
diff --git a/app/sdk/src/store.ts b/app/sdk/src/store.ts
index f74cc04a..6001da23 100644
--- a/app/sdk/src/store.ts
+++ b/app/sdk/src/store.ts
@@ -243,8 +243,8 @@ export class OfflineStore implements Store {
   }
 
   public async getMarkers(guid: string, type: string): Promise<{id: string, value: string}[]> {
-    const markers = await this.getFilteredValues(guid, 'marker', ['type', 'id'], [{ field: 'type', value: type }]);
-    return markers.map(marker => ({ id: marker.id, value: marker.id }));
+    const markers = await this.getFilteredValues(guid, 'marker', ['value', 'id'], [{ field: 'type', value: type }]);
+    return markers.map(marker => ({ id: marker.id, value: marker.value }));
   }
 
   public async setLogin(login: Login): Promise<void> {