diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index ba7d323..64ab09a 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -39,6 +39,11 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
             content = ""
         }
         
+        init(title: String) {
+            self.title = title
+            self.content = ""
+        }
+        
         init(title: String, content: String) {
             self.title = title
             self.content = content
@@ -46,12 +51,28 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     }
     
     private struct TableSection {
-        var title: String
+        var type: PasswordDetailTableViewControllerSectionType
+        var header: String?
         var item: Array<TableCell>
+        init(type: PasswordDetailTableViewControllerSectionType) {
+            self.type = type
+            header = nil
+            item = [TableCell]()
+        }
+        
+        init(type: PasswordDetailTableViewControllerSectionType, header: String) {
+            self.init(type: type)
+            self.header = header
+        }
     }
     
     private var tableData = Array<TableSection>()
     
+    private enum PasswordDetailTableViewControllerSectionType {
+        case name, main, addition, misc
+    }
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.register(UINib(nibName: "LabelTableViewCell", bundle: nil), forCellReuseIdentifier: "labelCell")
@@ -224,23 +245,31 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
 
     private func setTableData() {
         self.tableData = Array<TableSection>()
-        tableData.append(TableSection(title: "", item: []))
-        tableData[0].item.append(TableCell())
-        var tableDataIndex = 1
-        self.tableData.append(TableSection(title: "", item: []))
+        
+        // name section
+        var section = TableSection(type: .name)
+        section.item.append(TableCell())
+        tableData.append(section)
+
+        // main section
+        section = TableSection(type: .main)
         let password = self.password!
         if let username = password.getUsername() {
-            self.tableData[tableDataIndex].item.append(TableCell(title: "username", content: username))
+            section.item.append(TableCell(title: "username", content: username))
         }
-        self.tableData[tableDataIndex].item.append(TableCell(title: "password", content: password.password))
+        section.item.append(TableCell(title: "password", content: password.password))
+        tableData.append(section)
+
+        
+        // addition section
         
         // show one time password
         if password.otpType != .none {
             if let (title, otp) = self.password?.getOtpStrings() {
-                self.tableData.append(TableSection(title: "One time password", item: []))
-                tableDataIndex += 1
-                oneTimePasswordIndexPath = IndexPath(row: 0, section: tableDataIndex)
-                self.tableData[tableDataIndex].item.append(TableCell(title: title, content: otp))
+                section = TableSection(type: .addition, header: "One Time Password")
+                section.item.append(TableCell(title: title, content: otp))
+                tableData.append(section)
+                oneTimePasswordIndexPath = IndexPath(row: 0, section: tableData.count)
             }
         }
         
@@ -252,12 +281,18 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
                 (!Password.otpKeywords.contains($0) || !Defaults[.isHideOTPOn]) }
         
         if filteredAdditionKeys.count > 0 {
-            self.tableData.append(TableSection(title: "additions", item: []))
-            tableDataIndex += 1
+            section = TableSection(type: .addition, header: "additions")
             for additionKey in filteredAdditionKeys {
-                self.tableData[tableDataIndex].item.append(TableCell(title: additionKey, content: password.additions[additionKey]!))
+                section.item.append(TableCell(title: additionKey, content: password.additions[additionKey]!))
             }
+            tableData.append(section)
         }
+        
+        // misc section
+        section = TableSection(type: .misc)
+        section.item.append(TableCell(title: "Show Raw"))
+        tableData.append(section)
+        
     }
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -380,8 +415,9 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let sectionIndex = indexPath.section
         let rowIndex = indexPath.row
-        
-        if sectionIndex == 0 && rowIndex == 0 {
+        let tableDataItem = tableData[sectionIndex].item[rowIndex]
+        switch(tableData[sectionIndex].type) {
+        case .name:
             let cell = tableView.dequeueReusableCell(withIdentifier: "passwordDetailTitleTableViewCell", for: indexPath) as! PasswordDetailTitleTableViewCell
             cell.passwordImageImageView.image = passwordImage ?? #imageLiteral(resourceName: "PasswordImagePlaceHolder")
             var passwordName = passwordEntity!.name!
@@ -391,21 +427,25 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
             cell.nameLabel.text = passwordName
             cell.categoryLabel.text = passwordCategoryText
             return cell
-        } else {
+        case .main, .addition:
             let cell = tableView.dequeueReusableCell(withIdentifier: "labelCell", for: indexPath) as! LabelTableViewCell
-            let titleData = tableData[sectionIndex].item[rowIndex].title
-            let contentData = tableData[sectionIndex].item[rowIndex].content
+            let titleData = tableDataItem.title
+            let contentData = tableDataItem.content
             cell.delegatePasswordTableView = self
             cell.isPasswordCell = (titleData.lowercased() == "password" ? true : false)
             cell.isURLCell = (titleData.lowercased() == "url" ? true : false)
             cell.isHOTPCell = (titleData == "HMAC-based" ? true : false)
             cell.cellData = LabelTableViewCellData(title: titleData, content: contentData)
             return cell
+        case .misc:
+            let cell = UITableViewCell()
+            cell.textLabel?.text = tableDataItem.title
+            return cell
         }
     }
     
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        return tableData[section].title
+        return tableData[section].header
     }
     
     override func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {