diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index bb0fba423..f18ed06be 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.text.TextFlow?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailController"
@@ -12,10 +13,23 @@
 		<Insets bottom="6.0" left="6.0" right="6.0" top="6.0"/>
 	</padding>
 	<children>
-		<Label text="${controller.vault.displayableName}"/>
+		<!--TODO: add caption style class -->
+		<Text text="${controller.vault.displayableName}" />
+		<TextFlow><!--TODO: add visibility of the textflows -->
+			<Text text="%vaultDetail.info.storageLocation" />
+			<Text text="${controller.vault.displayablePath}"/>
+		</TextFlow>
+		<TextFlow>
+			<Text text="%vaultDetail.info.accessLocation" />
+			<Text text="${controller.vault.customMountPath}"/>
+		</TextFlow>
+		<TextFlow>
+			<Text text="%vaultDetail.info.currentState" />
+			<Text text="${controller.vault.locked}"/>
+		</TextFlow>
 
-		<Button text="TODO unlock" onAction="#unlock" visible="${controller.vault.locked}"/>
-		<Button text="TODO lock" onAction="#lock" visible="${controller.vault.unlocked}"/>
+		<Button text="TODO unlock" onAction="#unlock" visible="${controller.vault.locked}" defaultButton="${controller.vault.locked}"/>
+		<Button text="TODO lock" onAction="#lock" visible="${controller.vault.unlocked}" defaultButton="${controller.vault.unlocked}"/>
 		<Button text="TODO options" onAction="#showVaultOptions" visible="${controller.vault.locked}"/>
 		<Button text="TODO change password" onAction="#changePassword" visible="${controller.vault.locked}"/>
 	</children>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 04f2b7953..7e8dd357d 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -60,9 +60,17 @@ preferences.updates.checkNowBtn=Check Now
 ##Volume
 preferences.volume=Virtual Drive
 
+# Main window
 main.closeBtn.tooltip=Close
 main.settingsBtn.tooltip=Settings
 vaultlist.emptyList.onboardingInstruction=Click here to add a vault
+## Vault detail
+vaultDetail.info.storageLocation=Stored at
+vaultDetail.info.accessLocation=Accesssible at
+vaultDetail.info.currentState=Currently 
+
+
+# Misc/Not Classfied
 vaultOptions.mount.readonly=Read-Only
 vaultOptions.mount.driveName=Drive Name
 vaultOptions.mount.customMountFlags=Custom Mount Flags