diff --git a/harta-banilor-publici/ApiHelper.swift b/harta-banilor-publici/ApiHelper.swift
index d657cde..7150b09 100644
--- a/harta-banilor-publici/ApiHelper.swift
+++ b/harta-banilor-publici/ApiHelper.swift
@@ -42,15 +42,40 @@ struct InstitutionLicitatie: Codable {
     }
 }
 
+struct SearchResultLicitatie: Codable {
+    let id: Int
+    let titluContract: String
+    let valoareRON: String
+    let dataContract: String
+    
+    private enum CodingKeys: String, CodingKey {
+        case id = "LicitatieId", dataContract = "DataContract"
+        case titluContract = "TitluContract", valoareRON = "ValoareRON"
+    }
+}
+
+struct SearchResultContract: Codable {
+    let id: Int
+    let titluContract: String
+    let valoareRON: String
+    let dataContract: String
+    
+    private enum CodingKeys: String, CodingKey {
+        case id = "ContracteId", dataContract = "DataContract"
+        case titluContract = "TitluContract", valoareRON = "ValoareRON"
+    }
+}
+
+
 struct Contract: Codable {
-    let id, institutiePublicaID, companieId: Int
+    let id, institutiePublicaID, companieId, numarJustificari: Int
     let companieCUI, tipProcedura, institutiePublicaCUI, numarAnuntParticipare: String
     let dataAnuntParticipare, tipIncheiereContract, numarContract, dataContract: String
     let titluContract, cpvCode: String
     let valoareRON, valoareEUR: String
     
     private enum CodingKeys: String, CodingKey {
-        case id = "ContracteId", institutiePublicaID = "InstitutiePublicaID", companieId = "CompanieId"
+        case id = "ContracteId", institutiePublicaID = "InstitutiePublicaID", companieId = "CompanieId", numarJustificari = "NumarJustificari"
         case companieCUI = "CompanieCUI", tipProcedura = "TipProcedura", institutiePublicaCUI = "InstitutiePublicaCUI"
         case numarAnuntParticipare = "NumarAnuntParticipare", dataAnuntParticipare = "DataAnuntParticipare"
         case tipIncheiereContract = "TipIncheiereContract", numarContract = "NumarContract", dataContract = "DataContract"
@@ -59,22 +84,23 @@ struct Contract: Codable {
 }
 
 struct Licitatie: Codable {
-    let id, institutiePublicaID: Int
+    let id, institutiePublicaID, companieId, numarOfertePrimite, cpvCodeID, numarJustificari: Int
     let companieCUI, tip, tipContract, tipProcedura, institutiePublicaCUI, tipActivitateAC, numarAnuntAtribuire: String
-    let dataAnuntAtribuire, tipIncheiereContract, tipCriteriiAtribuire, CUILicitatieElectronica, numarOfertePrimite: String
-    let subcontractat, numarContract, dataContract: String
-    let titluContract, cpvCodeID, cpvCode, numarAnuntParticipare, dataAnuntParticipare: String
+    let dataAnuntAtribuire, tipIncheiereContract, tipCriteriiAtribuire: String
+    let numarContract, dataContract: String
+    let titluContract, cpvCode, numarAnuntParticipare, dataAnuntParticipare: String
     let valoareEstimataParticipare, monedaValoareEstimataParticipare, depoziteGarantii, modalitatiFinantare: String
     let valoareRON, valoareEUR: String
+    let CUILicitatieElectronica, subcontractat: Bool
     
     private enum CodingKeys: String, CodingKey {
-        case id = "LicitatiiId", institutiePublicaID = "InstitutiePublicaID"
-        case companieCUI = "CompanieCUI", tip = "Tip", tipContract = "TipContract", tipProcedura = "TipProcedura"
+        case id = "LicitatiiId", institutiePublicaID = "InstitutiePublicaID", companieId = "CompanieId", numarOfertePrimite = "NumarOfertePrimite"
+        case companieCUI = "CompanieCUI", tip = "Tip", tipContract = "TipContract", tipProcedura = "TipProcedura", numarJustificari = "NumarJustificari"
         case institutiePublicaCUI = "InstitutiePublicaCUI", tipActivitateAC = "TipActivitateAC", numarAnuntAtribuire = "NumarAnuntAtribuire"
         case dataAnuntAtribuire = "DataAnuntAtribuire", tipIncheiereContract = "TipIncheiereContract", tipCriteriiAtribuire = "TipCriteriiAtribuire"
-        case CUILicitatieElectronica = "CUILicitatieElectronica", numarOfertePrimite = "NumarOfertePrimite", subcontractat = "Subcontractat"
+        case CUILicitatieElectronica = "CUILicitatieElectronica", subcontractat = "Subcontractat"
         case numarContract = "NumarContract", dataContract = "DataContract", titluContract = "TitluContract", valoareRON = "ValoareRON"
-        case valoareEUR = "ValoareEUR", cpvCodeID = "CPVCodeID", cpvCode = "CPVCode", numarAnuntParticipare = "NumarAnuntParticipare"
+        case valoareEUR = "ValoareEUR", cpvCodeID = "CPVCodeId", cpvCode = "CPVCode", numarAnuntParticipare = "NumarAnuntParticipare"
         case dataAnuntParticipare = "DataAnuntParticipare", valoareEstimataParticipare = "ValoareEstimataParticipare"
         case monedaValoareEstimataParticipare = "MonedaValoareEstimataParticipare", depoziteGarantii = "DepoziteGarantii", modalitatiFinantare = "ModalitatiFinantare"
     }
@@ -607,9 +633,9 @@ class ApiHelper {
     }
 
     
-    func searchContracts(pattern: String, handler: @escaping ([InstitutionContract], URLResponse?, Error?) -> Void) {
-        var contractResults: [InstitutionContract] = []
-        let url = self.apiURL + "SearchContract/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+    func searchContracts(pattern: String, handler: @escaping ([SearchResultContract], URLResponse?, Error?) -> Void) {
+        var contractResults: [SearchResultContract] = []
+        let url = self.apiURL + "SearchAD/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching Contracts: " + url)
 
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
@@ -622,7 +648,7 @@ class ApiHelper {
                 return
             }
             do {
-                contractResults = try JSONDecoder().decode([InstitutionContract].self, from: data)
+                contractResults = try JSONDecoder().decode([SearchResultContract].self, from: data)
                 handler(contractResults, response, error)
             } catch let error {
                 print("json error: \(error)")
@@ -632,12 +658,12 @@ class ApiHelper {
         task.resume()
     }
     
-    func searchLicitatii(pattern: String, handler: @escaping ([InstitutionLicitatie], URLResponse?, Error?) -> Void) {
-        var licitatieResults: [InstitutionLicitatie] = []
+    func searchLicitatii(pattern: String, handler: @escaping ([SearchResultLicitatie], URLResponse?, Error?) -> Void) {
+        var licitatieResults: [SearchResultLicitatie] = []
 
-        let url = self.apiURL + "SearchTenters/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        let url = self.apiURL + "SearchTender/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching Licitatii for " + url)
-
+        
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
             guard error == nil else {
                 handler(licitatieResults, response, error)
@@ -648,7 +674,7 @@ class ApiHelper {
                 return
             }
             do {
-                licitatieResults = try JSONDecoder().decode([InstitutionLicitatie].self, from: data)
+                licitatieResults = try JSONDecoder().decode([SearchResultLicitatie].self, from: data)
                 handler(licitatieResults, response, error)
             } catch let error {
                 print("json error: \(error)")
@@ -657,4 +683,51 @@ class ApiHelper {
         }
         task.resume()
     }
+    
+    func semnaleazaAD(contractId: Int) {
+        let url = self.apiURL + "JustifyAD/" + String(contractId)
+        print("Semnaleaza AD " + url)
+        
+        var request = URLRequest(url: URL(string: url)!)
+        request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+        request.httpMethod = "POST"
+
+        
+        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            guard error == nil else {
+                print("error=\(String(describing: error))")
+                return
+            }
+            
+            if let httpStatus = response as? HTTPURLResponse, httpStatus.statusCode != 200 {
+                print("statusCode should be 200, but is \(httpStatus.statusCode)")
+                print("response = \(String(describing: response))")
+            }
+
+        }
+        task.resume()
+    }
+    
+    func semnaleazaTender(tenderId: Int) {
+        let url = self.apiURL + "JustifyTender/" + String(tenderId)
+        print("Semnaleaza AD " + url)
+        
+        var request = URLRequest(url: URL(string: url)!)
+        request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+        request.httpMethod = "POST"
+        
+        
+        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            guard error == nil else {
+                print("error=\(String(describing: error))")
+                return
+            }
+            
+            if let httpStatus = response as? HTTPURLResponse, httpStatus.statusCode != 200 {
+                print("statusCode should be 200, but is \(httpStatus.statusCode)")
+                print("response = \(String(describing: response))")
+            }
+        }
+        task.resume()
+    }
 }
diff --git a/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart.png b/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart.png
deleted file mode 100644
index 84324af..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart@2x.png b/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart@2x.png
deleted file mode 100644
index 116df33..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart@2x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart@3x.png b/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart@3x.png
deleted file mode 100644
index d30736b..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/barchart.imageset/barchart@3x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/search.imageset/Contents.json b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/Contents.json
similarity index 64%
rename from harta-banilor-publici/Assets.xcassets/search.imageset/Contents.json
rename to harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/Contents.json
index 216ea4a..70512d5 100644
--- a/harta-banilor-publici/Assets.xcassets/search.imageset/Contents.json
+++ b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "search.png",
+      "filename" : "ic_info_outline_black.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "search@2x.png",
+      "filename" : "ic_info_outline_black@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "search@3x.png",
+      "filename" : "ic_info_outline_black@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black.png b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black.png
new file mode 100644
index 0000000..8cd9fca
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black@2x.png b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black@2x.png
new file mode 100644
index 0000000..ad36973
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black@2x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black@3x.png b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black@3x.png
new file mode 100644
index 0000000..44a7b28
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_info_outline_black.imageset/ic_info_outline_black@3x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/barchart.imageset/Contents.json b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/Contents.json
similarity index 68%
rename from harta-banilor-publici/Assets.xcassets/barchart.imageset/Contents.json
rename to harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/Contents.json
index d4a1612..12f667a 100644
--- a/harta-banilor-publici/Assets.xcassets/barchart.imageset/Contents.json
+++ b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "barchart.png",
+      "filename" : "ic_map_black.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "barchart@2x.png",
+      "filename" : "ic_map_black@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "barchart@3x.png",
+      "filename" : "ic_map_black@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black.png b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black.png
new file mode 100644
index 0000000..c9070d3
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black@2x.png b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black@2x.png
new file mode 100644
index 0000000..eb7382c
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black@2x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black@3x.png b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black@3x.png
new file mode 100644
index 0000000..8796e80
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_map_black.imageset/ic_map_black@3x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/info.imageset/Contents.json b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/Contents.json
similarity index 67%
rename from harta-banilor-publici/Assets.xcassets/info.imageset/Contents.json
rename to harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/Contents.json
index c7d3dae..06c4ce2 100644
--- a/harta-banilor-publici/Assets.xcassets/info.imageset/Contents.json
+++ b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "info.png",
+      "filename" : "ic_search_black.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "info@2x.png",
+      "filename" : "ic_search_black@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "info@3x.png",
+      "filename" : "ic_search_black@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black.png b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black.png
new file mode 100644
index 0000000..d1d4492
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black@2x.png b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black@2x.png
new file mode 100644
index 0000000..accc3af
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black@2x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black@3x.png b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black@3x.png
new file mode 100644
index 0000000..28a5f6a
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_search_black.imageset/ic_search_black@3x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/Contents.json b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/Contents.json
similarity index 65%
rename from harta-banilor-publici/Assets.xcassets/placeholder.imageset/Contents.json
rename to harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/Contents.json
index 996d3e7..59955cd 100644
--- a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/Contents.json
+++ b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "placeholder.png",
+      "filename" : "ic_show_chart_black.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "placeholder@2x.png",
+      "filename" : "ic_show_chart_black@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "placeholder@3x.png",
+      "filename" : "ic_show_chart_black@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black.png b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black.png
new file mode 100644
index 0000000..c45537b
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black@2x.png b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black@2x.png
new file mode 100644
index 0000000..7a2cf56
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black@2x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black@3x.png b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black@3x.png
new file mode 100644
index 0000000..ada2317
Binary files /dev/null and b/harta-banilor-publici/Assets.xcassets/ic_show_chart_black.imageset/ic_show_chart_black@3x.png differ
diff --git a/harta-banilor-publici/Assets.xcassets/info.imageset/info.png b/harta-banilor-publici/Assets.xcassets/info.imageset/info.png
deleted file mode 100644
index 0d3d22f..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/info.imageset/info.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/info.imageset/info@2x.png b/harta-banilor-publici/Assets.xcassets/info.imageset/info@2x.png
deleted file mode 100644
index b6cecab..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/info.imageset/info@2x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/info.imageset/info@3x.png b/harta-banilor-publici/Assets.xcassets/info.imageset/info@3x.png
deleted file mode 100644
index 202ec6a..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/info.imageset/info@3x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder.png b/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder.png
deleted file mode 100644
index 882dd23..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder@2x.png b/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder@2x.png
deleted file mode 100644
index 5c98552..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder@2x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder@3x.png b/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder@3x.png
deleted file mode 100644
index a351e36..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/placeholder.imageset/placeholder@3x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/search.imageset/search.png b/harta-banilor-publici/Assets.xcassets/search.imageset/search.png
deleted file mode 100644
index 219e200..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/search.imageset/search.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/search.imageset/search@2x.png b/harta-banilor-publici/Assets.xcassets/search.imageset/search@2x.png
deleted file mode 100644
index 17438ff..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/search.imageset/search@2x.png and /dev/null differ
diff --git a/harta-banilor-publici/Assets.xcassets/search.imageset/search@3x.png b/harta-banilor-publici/Assets.xcassets/search.imageset/search@3x.png
deleted file mode 100644
index 36bb337..0000000
Binary files a/harta-banilor-publici/Assets.xcassets/search.imageset/search@3x.png and /dev/null differ
diff --git a/harta-banilor-publici/Base.lproj/Main.storyboard b/harta-banilor-publici/Base.lproj/Main.storyboard
index 4c711da..e845c50 100644
--- a/harta-banilor-publici/Base.lproj/Main.storyboard
+++ b/harta-banilor-publici/Base.lproj/Main.storyboard
@@ -282,6 +282,9 @@
                                 <state key="normal" title="SEMNALEAZA (0)">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
+                                <connections>
+                                    <action selector="pressedSemnaleazaButton:" destination="y7W-47-BTu" eventType="touchUpInside" id="qdz-I9-luk"/>
+                                </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28j-WF-HEz">
                                 <rect key="frame" x="15" y="7" width="343" height="69"/>
@@ -517,6 +520,7 @@
                         <barButtonItem key="rightBarButtonItem" systemItem="action" id="ifA-Sb-SkV"/>
                     </navigationItem>
                     <connections>
+                        <outlet property="cereJustificareButton" destination="he1-53-hbx" id="YKw-Ip-Fp6"/>
                         <outlet property="companieButton" destination="sUD-qc-apO" id="GFs-Al-aEJ"/>
                         <outlet property="companieLabel" destination="IpR-pJ-FGz" id="HOj-JQ-HCL"/>
                         <outlet property="cpvLabel" destination="gu6-6i-D2z" id="Byt-5J-Vog"/>
@@ -864,7 +868,7 @@
         <scene sceneID="o15-B0-DF4">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="xtV-Pc-eaH" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Hartă" image="placeholder" selectedImage="placeholder" id="64D-uo-1RU"/>
+                    <tabBarItem key="tabBarItem" title="Hartă" image="ic_map_black" selectedImage="ic_map_black" id="64D-uo-1RU"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" barStyle="black" translucent="NO" id="txu-tI-nbJ">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -888,7 +892,7 @@
         <scene sceneID="rgF-2o-nEX">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="V7S-Ob-cJm" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Caută" image="search" selectedImage="search" id="Ofu-Cp-9uF"/>
+                    <tabBarItem key="tabBarItem" title="Caută" image="ic_search_black" selectedImage="ic_search_black" id="Ofu-Cp-9uF"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" barStyle="black" translucent="NO" id="qBy-1y-pQ1">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -908,7 +912,7 @@
         <scene sceneID="Isi-VX-aqn">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="f9w-X5-AHf" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" enabled="NO" title="Statistici" image="barchart" selectedImage="barchart" id="N4W-NC-fj0"/>
+                    <tabBarItem key="tabBarItem" enabled="NO" title="Statistici" image="ic_show_chart_black" selectedImage="ic_show_chart_black" id="N4W-NC-fj0"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" barStyle="black" translucent="NO" id="Z0x-DG-h9E">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -928,7 +932,7 @@
         <scene sceneID="fCu-Pf-2bh">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="DAk-OI-E1T" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Info" image="info" selectedImage="info" id="IDp-pn-Wg1"/>
+                    <tabBarItem key="tabBarItem" title="Info" image="ic_info_outline_black" selectedImage="ic_info_outline_black" id="IDp-pn-Wg1"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" barStyle="black" translucent="NO" id="ywq-y7-udB">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -1091,8 +1095,8 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cumpărare directă" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Lj-Zp-du8">
-                                        <rect key="frame" x="206" y="266" width="129" height="21"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cumpărare directă" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Lj-Zp-du8">
+                                        <rect key="frame" x="206" y="266.5" width="129" height="20.5"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1163,8 +1167,8 @@
                                         <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Prețul cel mai scăzut" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nIT-Kf-mAe">
-                                        <rect key="frame" x="17" y="459" width="139" height="21"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Prețul cel mai scăzut" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nIT-Kf-mAe">
+                                        <rect key="frame" x="17" y="459" width="139" height="20.5"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1176,37 +1180,37 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MAM-Xc-tMi">
-                                        <rect key="frame" x="206" y="459" width="9" height="21"/>
+                                        <rect key="frame" x="206" y="458.5" width="9" height="21"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subcontractat" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="54h-nb-I3i">
-                                        <rect key="frame" x="17" y="488" width="83" height="18"/>
+                                        <rect key="frame" x="17" y="487.5" width="83" height="18"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="13"/>
                                         <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="false" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="umS-hA-TBe">
-                                        <rect key="frame" x="17" y="507" width="32" height="21"/>
+                                        <rect key="frame" x="17" y="506.5" width="32" height="21"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Valoare Estimată" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YXC-wP-7a2">
-                                        <rect key="frame" x="206" y="488" width="100" height="18"/>
+                                        <rect key="frame" x="206" y="487.5" width="100" height="18"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="13"/>
                                         <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="201613.0 RON" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IPx-AR-mBk">
-                                        <rect key="frame" x="206" y="507" width="104" height="21"/>
+                                        <rect key="frame" x="206" y="506.5" width="104" height="21"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" reversesTitleShadowWhenHighlighted="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QqZ-Os-AZ6">
-                                        <rect key="frame" x="116" y="709" width="140" height="47"/>
+                                        <rect key="frame" x="116" y="708.5" width="140" height="47"/>
                                         <color key="backgroundColor" red="0.31372549020000001" green="0.0" blue="0.078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="140" id="cGs-06-WtP"/>
@@ -1216,27 +1220,30 @@
                                         <state key="normal" title="SEMNALEAZA (0)">
                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
+                                        <connections>
+                                            <action selector="pressedSemnaleazaButton:" destination="UNO-tS-fE3" eventType="touchUpInside" id="uGf-sM-dJT"/>
+                                        </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Companie" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SuT-zT-gIX">
-                                        <rect key="frame" x="16" y="536" width="77" height="24"/>
+                                        <rect key="frame" x="16" y="535.5" width="77" height="24"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="13"/>
                                         <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ahF-oG-KpG">
-                                        <rect key="frame" x="15" y="560" width="290" height="47"/>
+                                        <rect key="frame" x="15" y="559.5" width="290" height="47"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="17"/>
                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0LS-QZ-a21">
-                                        <rect key="frame" x="15" y="648" width="290" height="47"/>
+                                        <rect key="frame" x="15" y="647.5" width="290" height="47"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="17"/>
                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="fill" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xik-Ys-Cj6">
-                                        <rect key="frame" x="304" y="654" width="54" height="38"/>
+                                        <rect key="frame" x="304" y="653.5" width="54" height="38"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="38" id="9yJ-bF-96r"/>
                                         </constraints>
@@ -1249,13 +1256,13 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Instituție" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f0H-WR-OPz">
-                                        <rect key="frame" x="15" y="624" width="77" height="24"/>
+                                        <rect key="frame" x="15" y="623.5" width="77" height="24"/>
                                         <fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="13"/>
                                         <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qzz-TC-XME">
-                                        <rect key="frame" x="16" y="554" width="342" height="4"/>
+                                        <rect key="frame" x="16" y="553.5" width="342" height="4"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="4" id="RnP-DP-1k9"/>
                                         </constraints>
@@ -1264,7 +1271,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="fill" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zK3-2g-Uur">
-                                        <rect key="frame" x="304" y="566" width="54" height="38"/>
+                                        <rect key="frame" x="304" y="565.5" width="54" height="38"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="54" id="Fwv-8d-Ohi"/>
                                             <constraint firstAttribute="height" constant="38" id="tqY-oE-bQu"/>
@@ -1278,7 +1285,7 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hph-KW-uHA">
-                                        <rect key="frame" x="16" y="609" width="342" height="4"/>
+                                        <rect key="frame" x="16" y="608.5" width="342" height="4"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="4" id="aMU-Lj-2eO"/>
                                         </constraints>
@@ -1287,7 +1294,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EYZ-3S-lx5">
-                                        <rect key="frame" x="16" y="642" width="343" height="4"/>
+                                        <rect key="frame" x="16" y="641.5" width="343" height="4"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="4" id="dIV-H8-dRb"/>
                                         </constraints>
@@ -1296,7 +1303,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ij-DH-xMR">
-                                        <rect key="frame" x="16" y="697" width="343" height="4"/>
+                                        <rect key="frame" x="16" y="696.5" width="343" height="4"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="4" id="r5b-tj-Buo"/>
                                         </constraints>
@@ -1439,7 +1446,33 @@
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="375" height="878"/>
                     <connections>
+                        <outlet property="cereJustificareButton" destination="QqZ-Os-AZ6" id="S78-tF-4iT"/>
+                        <outlet property="companieButton" destination="zK3-2g-Uur" id="IKD-aL-eOi"/>
+                        <outlet property="companieLabel" destination="ahF-oG-KpG" id="NGG-HV-d17"/>
+                        <outlet property="cpvLabel" destination="y7e-Kj-ZtU" id="P93-uv-lrx"/>
+                        <outlet property="criteriiAtribuireLabel" destination="nIT-Kf-mAe" id="RKH-Ss-1Kx"/>
+                        <outlet property="dataAnuntAtribuire" destination="bg1-mm-Wrk" id="eRD-kW-1i7"/>
+                        <outlet property="dataAnuntParticipareLabel" destination="BqM-At-nYe" id="FBn-Nj-eOw"/>
+                        <outlet property="dataContractLabel" destination="t35-7Y-QJM" id="0Jw-IH-xXL"/>
+                        <outlet property="institutieButton" destination="xik-Ys-Cj6" id="INk-9C-5pk"/>
+                        <outlet property="institutieLabel" destination="0LS-QZ-a21" id="nvK-Gg-hJU"/>
+                        <outlet property="numarAnuntAtribuireLabel" destination="cRY-do-CbK" id="ydK-3K-h1M"/>
+                        <outlet property="numarAnuntParticipareLabel" destination="6CL-Id-xTo" id="4cZ-SV-J87"/>
+                        <outlet property="numarContractLabel" destination="f3l-5Y-SHy" id="4s4-1C-Nds"/>
+                        <outlet property="numarOfertePrimiteLabel" destination="MAM-Xc-tMi" id="eGV-bI-pNk"/>
                         <outlet property="scrollView" destination="jPm-vy-gpQ" id="ytw-p6-Fjw"/>
+                        <outlet property="separatorLabel" destination="qzz-TC-XME" id="le4-Cc-QV3"/>
+                        <outlet property="separatorLabel2" destination="Hph-KW-uHA" id="xJP-RO-etJ"/>
+                        <outlet property="separatorLabel3" destination="EYZ-3S-lx5" id="V62-VP-dIP"/>
+                        <outlet property="separatorLabel4" destination="2Ij-DH-xMR" id="cNS-Cf-q7Y"/>
+                        <outlet property="subcontractLabel" destination="umS-hA-TBe" id="oSj-kc-UgF"/>
+                        <outlet property="tipContractLabel" destination="3hy-Rk-fhy" id="vl9-PV-Fmq"/>
+                        <outlet property="tipIncheiereLabel" destination="5Lj-Zp-du8" id="dKI-58-nrW"/>
+                        <outlet property="tipProceduraLabel" destination="Yb5-yf-azJ" id="njU-N0-Yzf"/>
+                        <outlet property="titluLabel" destination="fpi-Al-DhN" id="jkj-nl-ayg"/>
+                        <outlet property="valoareEUROLabel" destination="FHs-d9-rl1" id="qzp-Xr-noa"/>
+                        <outlet property="valoareEstimataLabel" destination="IPx-AR-mBk" id="SOv-XP-6ey"/>
+                        <outlet property="valoareRONLabel" destination="fto-YF-Gtj" id="cLe-b0-Wdo"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="prN-yA-r3T" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1448,16 +1481,16 @@
         </scene>
     </scenes>
     <resources>
-        <image name="barchart" width="25" height="25"/>
         <image name="city-hall" width="32" height="32"/>
-        <image name="info" width="25" height="25"/>
-        <image name="placeholder" width="25" height="25"/>
-        <image name="search" width="25" height="25"/>
+        <image name="ic_info_outline_black" width="25" height="25"/>
+        <image name="ic_map_black" width="25" height="25"/>
+        <image name="ic_search_black" width="25" height="25"/>
+        <image name="ic_show_chart_black" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="mHV-I0-o3g"/>
         <segue reference="fUa-g3-xJn"/>
         <segue reference="9oq-zI-RxO"/>
-        <segue reference="9iA-GD-Hts"/>
+        <segue reference="qxZ-MU-Jch"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/harta-banilor-publici/ContractViewController.swift b/harta-banilor-publici/ContractViewController.swift
index 80cc891..90c3f3b 100644
--- a/harta-banilor-publici/ContractViewController.swift
+++ b/harta-banilor-publici/ContractViewController.swift
@@ -40,14 +40,59 @@ class ContractViewController: UIViewController {
     @IBOutlet weak var tipIncheiereLabel: UILabel!
     @IBOutlet weak var tipProceduraLabel: UILabel!
     @IBOutlet weak var separatorLabel2: UILabel!
-    
     @IBOutlet weak var separatorLabel4: UILabel!
     @IBOutlet weak var separatorLabel3: UILabel!
+    @IBOutlet weak var cereJustificareButton: UIButton!
+    
     var contract: Contract!
     var api: ApiHelper!
     var companie: Companie!
     var institutie: Institution!
+    var userDefaults: UserDefaults!
     
+    @IBAction func pressedSemnaleazaButton(_ sender: Any) {
+        
+        let alreadySemnalat = self.userDefaults.bool(forKey: "contract_" + String(id))
+        if alreadySemnalat {
+            let alert = UIAlertController(title: "Ai mai semnalat acest contract.", message: "Mulțumim!", preferredStyle: UIAlertControllerStyle.alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+                switch action.style{
+                case .default:
+                    print("default")
+                    
+                case .cancel:
+                    print("cancel")
+                    
+                case .destructive:
+                    print("destructive")
+                    
+                    
+                }}))
+            self.present(alert, animated: true, completion: nil)
+        }
+        else {
+            self.api.semnaleazaAD(contractId: id)
+            userDefaults.set(true, forKey: "contract_" + String(id))
+            
+            let alert = UIAlertController(title: "Contractul a fost semnalat.", message: "Mulțumim!", preferredStyle: UIAlertControllerStyle.alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+                switch action.style{
+                case .default:
+                    print("default")
+                    
+                case .cancel:
+                    print("cancel")
+                    
+                case .destructive:
+                    print("destructive")
+                    
+                    
+                }}))
+            self.present(alert, animated: true, completion: nil)
+            self.cereJustificareButton.setTitle("Semnaleaza (" + String(self.contract.numarJustificari+1) + ")", for: .normal)
+        }
+
+    }
     @IBAction func pressedCompanieButton(_ sender: UIButton) {
         if senderId == self.companie.id {
             self.navigationController?.popViewController(animated: true)
@@ -72,6 +117,8 @@ class ContractViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        userDefaults = UserDefaults.standard
+
         api = ApiHelper()
         
         self.institutieButton.isEnabled = false
@@ -83,7 +130,7 @@ class ContractViewController: UIViewController {
         let companieLabelGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(ContractViewController.pressedCompanieButton(_:)))
         companieLabel.addGestureRecognizer(companieLabelGestureRecognizer)
         
-        titluLabel.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 0.5)
+        titluLabel.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 1)
         separatorLabel.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 1)
         separatorLabel2.layer.addBorder(edge: UIRectEdge.top, color: .groupTableViewBackground, thickness: 1)
         separatorLabel3.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 1)
@@ -106,6 +153,7 @@ class ContractViewController: UIViewController {
                 self.cpvLabel.text = self.contract.cpvCode
                 self.tipIncheiereLabel.text = self.contract.tipIncheiereContract
                 self.tipProceduraLabel.text = self.contract.tipProcedura
+                self.cereJustificareButton.setTitle("Semnaleaza (" + String(self.contract.numarJustificari) + ")", for: .normal)
             }
             DispatchQueue.main.async {
                 //TODO Check what kind of company we get by ID
diff --git a/harta-banilor-publici/InstitutionViewController.swift b/harta-banilor-publici/InstitutionViewController.swift
index d7849ab..d43c4bf 100644
--- a/harta-banilor-publici/InstitutionViewController.swift
+++ b/harta-banilor-publici/InstitutionViewController.swift
@@ -374,6 +374,7 @@ class InstitutionViewController: UIViewController, UITableViewDelegate, UITableV
         case 1:
             let controller = storyboard?.instantiateViewController(withIdentifier: "LicitatieViewController") as! LicitatieViewController
             controller.id = self.licitatii[indexPath.row].id
+            controller.senderId = self.id
             show(controller, sender: self)
         case 2:
             let controller = storyboard?.instantiateViewController(withIdentifier: "CompanieViewController") as! CompanieViewController
diff --git a/harta-banilor-publici/LicitatieViewController.swift b/harta-banilor-publici/LicitatieViewController.swift
index 2471e5c..3c1ca64 100644
--- a/harta-banilor-publici/LicitatieViewController.swift
+++ b/harta-banilor-publici/LicitatieViewController.swift
@@ -2,11 +2,196 @@ import Foundation
 
 class LicitatieViewController: UIViewController {
     var id: Int!
-    var senderId: String!
+    var senderId: Int!
+    var userDefaults: UserDefaults!
+    var api: ApiHelper!
+    var licitatie: Licitatie!
+    var companie: Companie!
+    var institutie: Institution!
 
+    @IBOutlet weak var titluLabel: UILabel!
+    @IBOutlet weak var institutieLabel: UILabel!
+    @IBOutlet weak var companieLabel: UILabel!
+    @IBOutlet weak var cpvLabel: UILabel!
+    @IBOutlet weak var dataContractLabel: UILabel!
+    @IBOutlet weak var valoareEUROLabel: UILabel!
+    @IBOutlet weak var valoareRONLabel: UILabel!
+    @IBOutlet weak var numarContractLabel: UILabel!
+    @IBOutlet weak var separatorLabel: UILabel!
+    @IBOutlet weak var companieButton: UIButton!
+    @IBOutlet weak var institutieButton: UIButton!
+    @IBOutlet weak var tipIncheiereLabel: UILabel!
+    @IBOutlet weak var tipProceduraLabel: UILabel!
+    @IBOutlet weak var separatorLabel2: UILabel!
+    @IBOutlet weak var separatorLabel4: UILabel!
+    @IBOutlet weak var separatorLabel3: UILabel!
+    @IBOutlet weak var dataAnuntParticipareLabel: UILabel!
+    @IBOutlet weak var tipContractLabel: UILabel!
+    @IBOutlet weak var numarAnuntParticipareLabel: UILabel!
+    @IBOutlet weak var dataAnuntAtribuire: UILabel!
+    @IBOutlet weak var criteriiAtribuireLabel: UILabel!
+    @IBOutlet weak var numarOfertePrimiteLabel: UILabel!
+    @IBOutlet weak var subcontractLabel: UILabel!
+    @IBOutlet weak var valoareEstimataLabel: UILabel!
     @IBOutlet weak var scrollView: UIScrollView!
+    @IBOutlet weak var cereJustificareButton: UIButton!
+    
+    @IBOutlet weak var numarAnuntAtribuireLabel: UILabel!
+    
+    @IBAction func pressedSemnaleazaButton(_ sender: Any) {
+        let alreadySemnalat = self.userDefaults.bool(forKey: "licitatie_" + String(id))
+        if alreadySemnalat {
+            let alert = UIAlertController(title: "Ai mai semnalat acest contract.", message: "Mulțumim!", preferredStyle: UIAlertControllerStyle.alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+                switch action.style{
+                case .default:
+                    print("default")
+                    
+                case .cancel:
+                    print("cancel")
+                    
+                case .destructive:
+                    print("destructive")
+                    
+                    
+                }}))
+            self.present(alert, animated: true, completion: nil)
+        }
+        else {
+            self.api.semnaleazaTender(tenderId: id)
+            userDefaults.set(true, forKey: "licitatie_" + String(id))
+            
+            let alert = UIAlertController(title: "Contractul a fost semnalat.", message: "Mulțumim!", preferredStyle: UIAlertControllerStyle.alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+                switch action.style{
+                case .default:
+                    print("default")
+                    
+                case .cancel:
+                    print("cancel")
+                    
+                case .destructive:
+                    print("destructive")
+                    
+                    
+                }}))
+            self.present(alert, animated: true, completion: nil)
+            self.cereJustificareButton.setTitle("Semnaleaza (" + String(self.licitatie.numarJustificari+1) + ")", for: .normal)
+        }
+
+    }
+    
+    @IBAction func pressedCompanieButton(_ sender: UIButton) {
+        if senderId == self.companie.id {
+            self.navigationController?.popViewController(animated: true)
+        } else {
+            let controller = storyboard?.instantiateViewController(withIdentifier: "CompanieViewController") as! CompanieViewController
+            controller.id = self.companie.id
+            controller.ad = self.companie.ad
+            show(controller, sender: self)
+        }
+    }
+    
+    @IBAction func pressedInstitutieButton(_ sender: UIButton) {
+        if senderId == self.institutie.id {
+            self.navigationController?.popViewController(animated: true)
+        } else {
+            let controller = storyboard?.instantiateViewController(withIdentifier: "InstitutionViewController") as! InstitutionViewController
+            controller.id = self.institutie.id
+            controller.institutionName = self.institutie.nume
+            show(controller, sender: self)
+        }
+    }
+
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        api = ApiHelper()
         scrollView.delaysContentTouches = false
+        userDefaults = UserDefaults.standard
+        
+        let institutionLabelGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(ContractViewController.pressedInstitutieButton(_:)))
+        institutieLabel.addGestureRecognizer(institutionLabelGestureRecognizer)
+        
+        let companieLabelGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(ContractViewController.pressedCompanieButton(_:)))
+        companieLabel.addGestureRecognizer(companieLabelGestureRecognizer)
+        
+        titluLabel.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 1)
+        separatorLabel.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 1)
+        separatorLabel2.layer.addBorder(edge: UIRectEdge.top, color: .groupTableViewBackground, thickness: 1)
+        separatorLabel3.layer.addBorder(edge: UIRectEdge.bottom, color: .groupTableViewBackground, thickness: 1)
+        separatorLabel4.layer.addBorder(edge: UIRectEdge.top, color: .groupTableViewBackground, thickness: 1)
+        tipIncheiereLabel.adjustsFontSizeToFitWidth = true
+        dataAnuntAtribuire.adjustsFontSizeToFitWidth = true
+        
+        api.getLicitatieByID(id: self.id) { (licitatie, response, error) -> Void in
+            guard error == nil else {
+                print(error!)
+                return
+            }
+            self.licitatie = licitatie
+            DispatchQueue.main.async {
+                print("DONE Fetching Licitatie")
+                self.titluLabel.text = self.licitatie.titluContract
+                self.titluLabel.adjustsFontSizeToFitWidth = true
+                self.numarContractLabel.text = self.licitatie.numarContract
+                self.valoareRONLabel.text = self.licitatie.valoareRON + " RON"
+                self.valoareEUROLabel.text = self.licitatie.valoareEUR + " EURO"
+                self.dataContractLabel.text = self.licitatie.dataContract
+                self.cpvLabel.text = self.licitatie.cpvCode
+                self.tipIncheiereLabel.text = self.licitatie.tipIncheiereContract
+                self.tipProceduraLabel.text = self.licitatie.tipProcedura
+                self.tipContractLabel.text = self.licitatie.tipContract
+                self.numarAnuntParticipareLabel.text = self.licitatie.numarAnuntParticipare
+                self.dataAnuntParticipareLabel.text = self.licitatie.dataAnuntParticipare
+                self.numarAnuntAtribuireLabel.text = self.licitatie.numarAnuntAtribuire
+                self.dataAnuntAtribuire.text = self.licitatie.dataAnuntAtribuire
+                self.criteriiAtribuireLabel.text = self.licitatie.tipCriteriiAtribuire
+                self.numarOfertePrimiteLabel.text = String(self.licitatie.numarOfertePrimite)
+                self.subcontractLabel.text = String(self.licitatie.subcontractat)
+                self.valoareEstimataLabel.text = self.licitatie.valoareEstimataParticipare
+                self.cereJustificareButton.setTitle("Semnaleaza (" + String(self.licitatie.numarJustificari) + ")", for: .normal)
+            }
+            DispatchQueue.main.async {
+                //TODO Check what kind of company we get by ID
+                // https://github.com/initiativaromania/HBP-web/issues/5
+                self.api.getADCompany(id: self.licitatie.companieId) { (companie, _ respone, error) -> Void in
+                    if error == nil && (companie != nil) {
+                        self.companie = companie
+                        DispatchQueue.main.async {
+                            self.companieLabel.text = self.companie.nume
+                            self.companieLabel.adjustsFontSizeToFitWidth = true
+                            self.companieButton.isEnabled = true
+                        }
+                    } else {
+                        self.api.getTenderCompany(id: self.licitatie.companieId) { (companie, _ response, error) -> Void in
+                            if error == nil && (companie != nil) {
+                                self.companie = companie
+                                DispatchQueue.main.async {
+                                    self.companieLabel.text = self.companie.nume
+                                    self.companieLabel.adjustsFontSizeToFitWidth = true
+                                    self.companieButton.isEnabled = true
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            DispatchQueue.main.async {
+                self.api.getInstitutionByID(id: self.licitatie.institutiePublicaID) { (institutie, _ response, error) -> Void in
+                    guard error == nil else {
+                        print(error!)
+                        return
+                    }
+                    self.institutie = institutie
+                    DispatchQueue.main.async {
+                        self.institutieLabel.text = self.institutie.nume
+                        self.institutieLabel.adjustsFontSizeToFitWidth = true
+                        self.institutieButton.isEnabled = true
+                    }
+                }
+            }
+        }
+
     }
 }
diff --git a/harta-banilor-publici/SearchViewController.swift b/harta-banilor-publici/SearchViewController.swift
index 3f9b7aa..2dfe3a2 100644
--- a/harta-banilor-publici/SearchViewController.swift
+++ b/harta-banilor-publici/SearchViewController.swift
@@ -8,8 +8,8 @@ class SearchViewController: UIViewController, UITableViewDataSource,
 
     var companieResults: [CompanieByInstitution] = []
     var institutionResults: [Institution] = []
-    var contractResults: [InstitutionContract] = []
-    var licitatieResults: [InstitutionLicitatie] = []
+    var contractResults: [SearchResultContract] = []
+    var licitatieResults: [SearchResultLicitatie] = []
     let cellReuseIdentifier = "cell"
     let searchController = UISearchController(searchResultsController: nil)
     var isSearchingInstitutions: Bool = false