diff --git a/DialogJobOdpri.Designer.vb b/DialogJobOdpri.Designer.vb
index f017cc2..b57af4a 100644
--- a/DialogJobOdpri.Designer.vb
+++ b/DialogJobOdpri.Designer.vb
@@ -22,6 +22,7 @@ Partial Class DialogJobOdpri
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DialogJobOdpri))
         Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
         Me.OK_Button = New System.Windows.Forms.Button()
@@ -34,6 +35,8 @@ Partial Class DialogJobOdpri
         Me.LabelDatum = New System.Windows.Forms.Label()
         Me.LabelDatoteka = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.ImageListJob = New System.Windows.Forms.ImageList(Me.components)
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.TableLayoutPanel1.SuspendLayout()
         Me.TableLayoutPanel2.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
@@ -67,7 +70,7 @@ Partial Class DialogJobOdpri
         Me.OK_Button.Name = "OK_Button"
         Me.OK_Button.Size = New System.Drawing.Size(90, 35)
         Me.OK_Button.TabIndex = 1
-        Me.OK_Button.Text = "Naloži Job"
+        Me.OK_Button.Text = "Odpri Job"
         Me.OK_Button.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
         '
         'Cancel_Button
@@ -114,6 +117,7 @@ Partial Class DialogJobOdpri
         Me.ListView1.Name = "ListView1"
         Me.ListView1.ShowItemToolTips = True
         Me.ListView1.Size = New System.Drawing.Size(177, 278)
+        Me.ListView1.SmallImageList = Me.ImageListJob
         Me.ListView1.TabIndex = 0
         Me.ListView1.UseCompatibleStateImageBehavior = False
         Me.ListView1.View = System.Windows.Forms.View.List
@@ -126,16 +130,14 @@ Partial Class DialogJobOdpri
         '
         Me.TableLayoutPanel2.ColumnCount = 1
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.TableLayoutPanel2.Controls.Add(Me.LabelMapa, 0, 0)
-        Me.TableLayoutPanel2.Controls.Add(Me.LabelDatum, 0, 2)
-        Me.TableLayoutPanel2.Controls.Add(Me.LabelDatoteka, 0, 1)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelDatoteka, 0, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelDatum, 0, 1)
         Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 19)
         Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
-        Me.TableLayoutPanel2.RowCount = 3
+        Me.TableLayoutPanel2.RowCount = 2
         Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
         Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
-        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
-        Me.TableLayoutPanel2.Size = New System.Drawing.Size(181, 90)
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(181, 60)
         Me.TableLayoutPanel2.TabIndex = 3
         '
         'LabelMapa
@@ -143,9 +145,9 @@ Partial Class DialogJobOdpri
         Me.LabelMapa.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelMapa.AutoSize = True
         Me.LabelMapa.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.LabelMapa.Location = New System.Drawing.Point(3, 8)
+        Me.LabelMapa.Location = New System.Drawing.Point(243, 14)
         Me.LabelMapa.Name = "LabelMapa"
-        Me.LabelMapa.Size = New System.Drawing.Size(175, 13)
+        Me.LabelMapa.Size = New System.Drawing.Size(16, 13)
         Me.LabelMapa.TabIndex = 2
         Me.LabelMapa.Text = "..."
         '
@@ -153,7 +155,7 @@ Partial Class DialogJobOdpri
         '
         Me.LabelDatum.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelDatum.AutoSize = True
-        Me.LabelDatum.Location = New System.Drawing.Point(3, 68)
+        Me.LabelDatum.Location = New System.Drawing.Point(3, 38)
         Me.LabelDatum.Name = "LabelDatum"
         Me.LabelDatum.Size = New System.Drawing.Size(175, 13)
         Me.LabelDatum.TabIndex = 3
@@ -164,7 +166,7 @@ Partial Class DialogJobOdpri
         Me.LabelDatoteka.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelDatoteka.AutoSize = True
         Me.LabelDatoteka.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.LabelDatoteka.Location = New System.Drawing.Point(3, 37)
+        Me.LabelDatoteka.Location = New System.Drawing.Point(3, 7)
         Me.LabelDatoteka.Name = "LabelDatoteka"
         Me.LabelDatoteka.Size = New System.Drawing.Size(175, 16)
         Me.LabelDatoteka.TabIndex = 1
@@ -173,13 +175,28 @@ Partial Class DialogJobOdpri
         'GroupBox1
         '
         Me.GroupBox1.Controls.Add(Me.TableLayoutPanel2)
-        Me.GroupBox1.Location = New System.Drawing.Point(199, 12)
+        Me.GroupBox1.Location = New System.Drawing.Point(199, 35)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(193, 124)
+        Me.GroupBox1.Size = New System.Drawing.Size(193, 90)
         Me.GroupBox1.TabIndex = 4
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Job"
         '
+        'ImageListJob
+        '
+        Me.ImageListJob.ImageStream = CType(resources.GetObject("ImageListJob.ImageStream"), System.Windows.Forms.ImageListStreamer)
+        Me.ImageListJob.TransparentColor = System.Drawing.Color.Transparent
+        Me.ImageListJob.Images.SetKeyName(0, "icons8-file-GSI-50.png")
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(200, 14)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(37, 13)
+        Me.Label1.TabIndex = 5
+        Me.Label1.Text = "Mapa:"
+        '
         'DialogJobOdpri
         '
         Me.AcceptButton = Me.OK_Button
@@ -187,6 +204,8 @@ Partial Class DialogJobOdpri
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.CancelButton = Me.Cancel_Button
         Me.ClientSize = New System.Drawing.Size(404, 352)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.LabelMapa)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.ListView1)
         Me.Controls.Add(Me.TableLayoutPanel1)
@@ -204,6 +223,7 @@ Partial Class DialogJobOdpri
         Me.TableLayoutPanel2.PerformLayout()
         Me.GroupBox1.ResumeLayout(False)
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
     Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
@@ -217,4 +237,6 @@ Partial Class DialogJobOdpri
     Friend WithEvents LabelDatum As Label
     Friend WithEvents GroupBox1 As GroupBox
     Friend WithEvents ButtonUvozi As Button
+    Friend WithEvents ImageListJob As ImageList
+    Friend WithEvents Label1 As Label
 End Class
diff --git a/DialogJobOdpri.resx b/DialogJobOdpri.resx
index 1afa7d1..bc7ca64 100644
--- a/DialogJobOdpri.resx
+++ b/DialogJobOdpri.resx
@@ -117,6 +117,45 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ImageListJob.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="ImageListJob.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACg
+        BgAAAk1TRnQBSQFMAwEBAAEIAQABCAEAARQBAAEUAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABUAMA
+        ARQDAAEBAQABIAYAARn/AP8ApAAB/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHm
+        AVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAB/wF2AXEBSQGC/wANAAH/AeYBUAL/AeYBUAH/
+        AWoBOQENAf8BagE5AQ0B/wGDAVoBGgL/AeYBUAH/AWoBOQENAf8BagE5AQ0B/wFqATkBDQL/AeYBUAH/
+        AWoBOQENAv8B5gFQAf8BlAGKAVABn/8ADQAB/wHmAVAB/wH7AeIBTwH/AaUBggEpAv8B5gFQAf8BagE5
+        AQ0C/wHmAVAB/wFqATkBDQL/AeYBUAH/AWoBOQENAv8B5gFQAf8BagE5AQ0C/wHmAVAB/wGUAYoBUAGf
+        /wANAAH/AeYBUAH/AfsB4gFPAf8BpQGCASkC/wHmAVAB/wFqATkBDQL/AeYBUAL/AeYBUAL/AeYBUAH/
+        AWoBOQENAv8B5gFQAf8BagE5AQ0C/wHmAVAB/wGUAYoBUAGf/wANAAH/AeYBUAH/AfsB4gFPAf8BpQGC
+        ASkB/wGgAXkBJgH/AWoBOQENAv8B5gFQAv8B5gFQAf8BrQGJASwB/wHmAcoBRgL/AeYBUAH/AWoBOQEN
+        Av8B5gFQAf8BlAGKAVABn/8ADQAB/wHmAVAB/wH7AeIBTwH/AaUBggEpAv8B5gFQAv8B5gFQAv8B5gFQ
+        Af8B1QG4AT4B/wHNAa4BOwL/AeYBUAL/AeYBUAH/AWoBOQENAv8B5gFQAf8BlAGKAVABn/8ADQAB/wHm
+        AVAB/wH7AeIBTwH/AaUBggEpAv8B5gFQAf8BagE5AQ0C/wHmAVAB/wFqATkBDQL/AeYBUAH/AbUBkAEv
+        Av8B5gFQAf8BagE5AQ0C/wHmAVAB/wGUAYoBUAGf/wANAAH/AeYBUAH/AfsB4gFPAf8BpQGCASkC/wHm
+        AVAB/wFqATkBDQL/AeYBUAH/AWoBOQENAv8B5gFQAf8BagE5AQ0C/wHmAVAB/wFqATkBDQL/AeYBUAH/
+        AZQBigFQAZ//AA0AAf8B5gFQAv8B5gFQAf8BtQGQAS8B/wG1AZABLwH/AcEBoAE1Av8B5gFQAf8BtQGQ
+        AS8B/wG1AZABLwH/AbUBkAEvAv8B5gFQAf8BtQGQAS8C/wHmAVAB/wGUAYoBUAGf/wANAAH/AeYBUAL/
+        AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/
+        AeYBUAH/AZQBigFQAZ//AA0AAf8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQ
+        Av8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQAf8BlAGKAVABn/8ADQAB/wHmAVAC/wHmAVAC/wHm
+        AVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAC/wHmAVAB/wHVAXkBLwH/AdUBegEuAf8B1AF7ASwB/wHT
+        AXwBKgH//wARAAH/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAH/
+        AdUBegEuAf8B1AF7ASwB/wHTAXwBKgH/AScBJQEiAS//ABEAAf8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQ
+        Av8B5gFQAv8B5gFQAv8B5gFQAv8B5gFQAf8B1AF7ASwB/wHTAXwBKgH//wAZAAH/AeYBUAL/AeYBUAL/
+        AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAL/AeYBUAH/AdMBfAEqAf8BJwElASIBL/8AGQABdQFv
+        AUkBgQHFAbUBVQHMAcUBtQFVAcwBxQG1AVUBzAHFAbUBVQHMAcUBtQFVAcwBxQG1AVUBzAHFAbUBVQHM
+        /wD/AP8AkwABQgFNAT4HAAE+AwABKAMAAVADAAEUAwABAQEAAQEFAAHwFwAD/wEAAv8B8AkAAv8B8AkA
+        AfABAAFwCQAB8AEAAXAJAAHwAQABcAkAAfABAAFwCQAB8AEAAXAJAAHwAQABcAkAAfABAAFwCQAB8AEA
+        AXAJAAHwAQABcAkAAfABAAFwCQAB8AEAAXAJAAHwAQAB8AkAAfABAAHwCQAB8AEDAfAJAAHwAQMB8AkA
+        AfABDwHwCQAC/wHwCQAC/wHwCQAL
+</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/DialogJobOdpri.vb b/DialogJobOdpri.vb
index 56413e7..8d99803 100644
--- a/DialogJobOdpri.vb
+++ b/DialogJobOdpri.vb
@@ -1,5 +1,6 @@
 Imports System.IO
 Imports System.Windows.Forms
+Imports System.Windows.Forms.ListViewItem
 
 
 Public Class DialogJobOdpri
@@ -13,9 +14,13 @@ Public Class DialogJobOdpri
         mapa = My.Settings.ProjektMapa.ToString
         Dim delovnaMapa = My.Application.Info.DirectoryPath.ToString + "\" + mapa.ToString
         Dim datotekeJobi = My.Computer.FileSystem.GetFiles(delovnaMapa, FileIO.SearchOption.SearchTopLevelOnly, "*.GSI")
+        Dim i As Integer = 0
         ListView1.Clear()
+
         For Each datJob In datotekeJobi
             ListView1.Items.Add(Path.GetFileName(datJob).ToString).SubItems.Add(Path.GetFullPath(datJob))
+            ListView1.Items.Item(i).ImageIndex = 0
+            i = i + 1
         Next
         LabelMapa.Text = mapa.ToString
     End Sub
diff --git a/DialogPripravaKartice.Designer.vb b/DialogPripravaKartice.Designer.vb
index ea603e2..0aafd9a 100644
--- a/DialogPripravaKartice.Designer.vb
+++ b/DialogPripravaKartice.Designer.vb
@@ -32,9 +32,13 @@ Partial Class DialogPripravaKartice
         Me.ComboBox1 = New System.Windows.Forms.ComboBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
-        Me.LabelPogonIme = New System.Windows.Forms.Label()
         Me.LabelSize = New System.Windows.Forms.Label()
         Me.LabelTip = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
+        Me.TextBoxPogonIme = New System.Windows.Forms.TextBox()
         Me.TableLayoutPanel1.SuspendLayout()
         Me.TableLayoutPanel2.SuspendLayout()
         Me.SuspendLayout()
@@ -50,11 +54,11 @@ Partial Class DialogPripravaKartice
         Me.TableLayoutPanel1.Controls.Add(Me.Button_Pripravi, 1, 0)
         Me.TableLayoutPanel1.Controls.Add(Me.Button_Zapri, 3, 0)
         Me.TableLayoutPanel1.Controls.Add(Me.Button_Format, 0, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 139)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 179)
         Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
         Me.TableLayoutPanel1.RowCount = 1
         Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(310, 40)
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(340, 40)
         Me.TableLayoutPanel1.TabIndex = 0
         '
         'Button_Pripravi
@@ -63,14 +67,13 @@ Partial Class DialogPripravaKartice
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Button_Pripravi.AutoSize = True
-        Me.Button_Pripravi.DialogResult = System.Windows.Forms.DialogResult.Cancel
         Me.Button_Pripravi.Enabled = False
         Me.Button_Pripravi.FlatAppearance.BorderSize = 0
         Me.Button_Pripravi.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button_Pripravi.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_caps_lock_on_24
-        Me.Button_Pripravi.Location = New System.Drawing.Point(96, 3)
+        Me.Button_Pripravi.Location = New System.Drawing.Point(105, 3)
         Me.Button_Pripravi.Name = "Button_Pripravi"
-        Me.Button_Pripravi.Size = New System.Drawing.Size(87, 34)
+        Me.Button_Pripravi.Size = New System.Drawing.Size(96, 34)
         Me.Button_Pripravi.TabIndex = 1
         Me.Button_Pripravi.Text = "Pripravi"
         Me.Button_Pripravi.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
@@ -81,12 +84,13 @@ Partial Class DialogPripravaKartice
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Button_Zapri.AutoSize = True
+        Me.Button_Zapri.DialogResult = System.Windows.Forms.DialogResult.Cancel
         Me.Button_Zapri.FlatAppearance.BorderSize = 0
         Me.Button_Zapri.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button_Zapri.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_24
-        Me.Button_Zapri.Location = New System.Drawing.Point(220, 3)
+        Me.Button_Zapri.Location = New System.Drawing.Point(241, 3)
         Me.Button_Zapri.Name = "Button_Zapri"
-        Me.Button_Zapri.Size = New System.Drawing.Size(87, 34)
+        Me.Button_Zapri.Size = New System.Drawing.Size(96, 34)
         Me.Button_Zapri.TabIndex = 2
         Me.Button_Zapri.Text = "Izhod"
         Me.Button_Zapri.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
@@ -103,7 +107,7 @@ Partial Class DialogPripravaKartice
         Me.Button_Format.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_error_24
         Me.Button_Format.Location = New System.Drawing.Point(3, 3)
         Me.Button_Format.Name = "Button_Format"
-        Me.Button_Format.Size = New System.Drawing.Size(87, 34)
+        Me.Button_Format.Size = New System.Drawing.Size(96, 34)
         Me.Button_Format.TabIndex = 3
         Me.Button_Format.Text = "Formatiraj"
         Me.Button_Format.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
@@ -133,78 +137,125 @@ Partial Class DialogPripravaKartice
         Me.ComboBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(49, 14)
+        Me.ComboBox1.Location = New System.Drawing.Point(3, 38)
         Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(71, 24)
+        Me.ComboBox1.Size = New System.Drawing.Size(62, 24)
         Me.ComboBox1.TabIndex = 0
         '
         'Label3
         '
-        Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
+        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(5, 19)
+        Me.Label3.Location = New System.Drawing.Point(3, 8)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(38, 13)
+        Me.Label3.Size = New System.Drawing.Size(62, 13)
         Me.Label3.TabIndex = 3
         Me.Label3.Text = "Pogon"
-        Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'TableLayoutPanel2
         '
-        Me.TableLayoutPanel2.ColumnCount = 5
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.0!))
+        Me.TableLayoutPanel2.ColumnCount = 4
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35.0!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.0!))
-        Me.TableLayoutPanel2.Controls.Add(Me.ComboBox1, 1, 0)
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.0!))
+        Me.TableLayoutPanel2.Controls.Add(Me.ComboBox1, 0, 1)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelSize, 2, 1)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelTip, 3, 1)
         Me.TableLayoutPanel2.Controls.Add(Me.Label3, 0, 0)
-        Me.TableLayoutPanel2.Controls.Add(Me.LabelPogonIme, 2, 0)
-        Me.TableLayoutPanel2.Controls.Add(Me.LabelSize, 3, 0)
-        Me.TableLayoutPanel2.Controls.Add(Me.LabelTip, 4, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.Label4, 1, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.Label5, 2, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.Label6, 3, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.TextBoxPogonIme, 1, 1)
         Me.TableLayoutPanel2.Location = New System.Drawing.Point(12, 81)
         Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
-        Me.TableLayoutPanel2.RowCount = 1
-        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.TableLayoutPanel2.Size = New System.Drawing.Size(310, 52)
+        Me.TableLayoutPanel2.RowCount = 2
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40.0!))
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(340, 70)
         Me.TableLayoutPanel2.TabIndex = 4
         '
-        'LabelPogonIme
-        '
-        Me.LabelPogonIme.Anchor = System.Windows.Forms.AnchorStyles.Left
-        Me.LabelPogonIme.AutoSize = True
-        Me.LabelPogonIme.Location = New System.Drawing.Point(126, 19)
-        Me.LabelPogonIme.Name = "LabelPogonIme"
-        Me.LabelPogonIme.Size = New System.Drawing.Size(32, 13)
-        Me.LabelPogonIme.TabIndex = 4
-        Me.LabelPogonIme.Text = "(IME)"
-        '
         'LabelSize
         '
         Me.LabelSize.Anchor = System.Windows.Forms.AnchorStyles.Left
         Me.LabelSize.AutoSize = True
-        Me.LabelSize.Location = New System.Drawing.Point(219, 19)
+        Me.LabelSize.Location = New System.Drawing.Point(190, 43)
         Me.LabelSize.Name = "LabelSize"
         Me.LabelSize.Size = New System.Drawing.Size(29, 13)
         Me.LabelSize.TabIndex = 5
         Me.LabelSize.Text = "(MB)"
+        Me.LabelSize.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'LabelTip
         '
-        Me.LabelTip.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LabelTip.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelTip.AutoSize = True
-        Me.LabelTip.Location = New System.Drawing.Point(265, 19)
+        Me.LabelTip.Location = New System.Drawing.Point(275, 43)
         Me.LabelTip.Name = "LabelTip"
-        Me.LabelTip.Size = New System.Drawing.Size(30, 13)
+        Me.LabelTip.Size = New System.Drawing.Size(62, 13)
         Me.LabelTip.TabIndex = 6
         Me.LabelTip.Text = "(TIP)"
+        Me.LabelTip.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'Label4
+        '
+        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(71, 8)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(113, 13)
+        Me.Label4.TabIndex = 3
+        Me.Label4.Text = "Ime"
+        Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'Label5
+        '
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(190, 8)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(79, 13)
+        Me.Label5.TabIndex = 3
+        Me.Label5.Text = "Velikost/Prosto"
+        Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'Label6
+        '
+        Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(275, 8)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(62, 13)
+        Me.Label6.TabIndex = 3
+        Me.Label6.Text = "Format"
+        Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'ProgressBar1
+        '
+        Me.ProgressBar1.ForeColor = System.Drawing.Color.YellowGreen
+        Me.ProgressBar1.Location = New System.Drawing.Point(12, 157)
+        Me.ProgressBar1.Name = "ProgressBar1"
+        Me.ProgressBar1.Size = New System.Drawing.Size(340, 16)
+        Me.ProgressBar1.Step = 1
+        Me.ProgressBar1.TabIndex = 6
+        '
+        'TextBoxPogonIme
+        '
+        Me.TextBoxPogonIme.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.TextBoxPogonIme.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.TextBoxPogonIme.Location = New System.Drawing.Point(71, 39)
+        Me.TextBoxPogonIme.Name = "TextBoxPogonIme"
+        Me.TextBoxPogonIme.Size = New System.Drawing.Size(100, 21)
+        Me.TextBoxPogonIme.TabIndex = 7
         '
         'DialogPripravaKartice
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.Button_Pripravi
-        Me.ClientSize = New System.Drawing.Size(334, 191)
+        Me.ClientSize = New System.Drawing.Size(364, 231)
+        Me.Controls.Add(Me.ProgressBar1)
         Me.Controls.Add(Me.TableLayoutPanel2)
         Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.Label1)
@@ -233,7 +284,11 @@ Partial Class DialogPripravaKartice
     Friend WithEvents Label3 As Label
     Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
     Friend WithEvents Button_Format As Button
-    Friend WithEvents LabelPogonIme As Label
     Friend WithEvents LabelSize As Label
     Friend WithEvents LabelTip As Label
+    Friend WithEvents ProgressBar1 As ProgressBar
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Label6 As Label
+    Friend WithEvents TextBoxPogonIme As TextBox
 End Class
diff --git a/DialogPripravaKartice.vb b/DialogPripravaKartice.vb
index 2f93d43..fac2a9a 100644
--- a/DialogPripravaKartice.vb
+++ b/DialogPripravaKartice.vb
@@ -67,30 +67,47 @@ Public Class DialogPripravaKartice
         Process.Start(karticaMapa)
     End Sub
 
-    Private Sub Button_Pripravi_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Pripravi.Click
+    Private Sub Button_Pripravi_Click(ByVal sender As Object, e As EventArgs) Handles Button_Pripravi.Click
         PripravaKartice()
 
-        MessageBox.Show("Kartica pripravljena...
+        MsgBox("Kartica pripravljena...
 Naloženo:
 - knjižnica z kodami TPS1100
 - Nastavitve za instrument TPS110x
 - Formati za izvoz podatkov na GPS500
-- Geoid SLOV2016.GEM za uporabo na GPS500")
+- Geoid SLOV2016.GEM za uporabo na GPS500", vbOKOnly, "Priprava Kartice")
 
-    End Sub
+        Dim allDrives() As DriveInfo = DriveInfo.GetDrives()
+        Dim d As DriveInfo
+        Dim totalSize
+        Dim availSize
+        Dim usedSize
 
-    Private Sub Button_Zapri_Click(sender As Object, e As EventArgs) Handles Button_Zapri.Click
-        Me.Close()
+        For Each d In allDrives
+            If d.Name = ComboBox1.Text Then
+                totalSize = Format(d.TotalSize / 1000 / 1000, "0")
+                availSize = Format(d.AvailableFreeSpace / 1000 / 1000, "0")
+                usedSize = totalSize - availSize
+                LabelSize.Text = totalSize.ToString + "/" + availSize.ToString + " MB"
+                TextBoxPogonIme.Text = d.VolumeLabel.ToString
+                LabelTip.Text = d.DriveFormat.ToString
+                ProgressBar1.Maximum = totalSize
+                ProgressBar1.Value = usedSize
+            End If
+        Next
 
     End Sub
 
     Private Sub Button_Format_Click(sender As Object, e As EventArgs) Handles Button_Format.Click
         Dim kartica As String = ComboBox1.Text.Replace("\", "")
         Dim karticaTip As String = LabelTip.Text
-        Dim msgFormat = MsgBox("Formatiranje pogona [" + kartica + "]. Nadaljujem?", vbOKCancel, "Formatiranje kartice...")
+        Dim kartivaLabel As String = TextBoxPogonIme.Text
+
+        Dim msgFormat = MsgBox("Formatiran bo pogona [" + kartica + "]. Nadaljujem?", vbOKCancel, "Formatiranje kartice...")
 
         If msgFormat = DialogResult.OK Then
-            Shell("cmd /c format " + kartica + " /FS:" + karticaTip + " /V:PCCARD /Q", AppWinStyle.NormalFocus)
+            Shell("cmd /c format " + kartica + " /fs:" + karticaTip + " /v:" + kartivaLabel + " /q", AppWinStyle.NormalFocus)
+            ProgressBar1.Value = 0
         Else
             MsgBox("Postopek prekinjen.", vbOKOnly)
         End If
@@ -100,12 +117,20 @@ Naloženo:
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
         Dim allDrives() As DriveInfo = DriveInfo.GetDrives()
         Dim d As DriveInfo
+        Dim totalSize
+        Dim availSize
+        Dim usedSize
 
         For Each d In allDrives
             If d.Name = ComboBox1.Text Then
-                LabelSize.Text = Format(d.TotalSize / 1000 / 1000, "0").ToString + " MB"
-                LabelPogonIme.Text = d.VolumeLabel.ToString
+                totalSize = Format(d.TotalSize / 1000 / 1000, "0")
+                availSize = Format(d.AvailableFreeSpace / 1000 / 1000, "0")
+                usedSize = totalSize - availSize
+                LabelSize.Text = totalSize.ToString + "/" + availSize.ToString + " MB"
+                TextBoxPogonIme.Text = d.VolumeLabel.ToString
                 LabelTip.Text = d.DriveFormat.ToString
+                ProgressBar1.Maximum = totalSize
+                ProgressBar1.Value = usedSize
             End If
         Next
 
@@ -113,4 +138,9 @@ Naloženo:
         Button_Pripravi.Enabled = True
 
     End Sub
+
+    Private Sub Button_Zapri_Click(sender As Object, e As EventArgs) Handles Button_Zapri.Click
+        Me.Close()
+
+    End Sub
 End Class
diff --git a/DialogZavarovanje.vb b/DialogZavarovanje.vb
index cd69b83..9b68603 100644
--- a/DialogZavarovanje.vb
+++ b/DialogZavarovanje.vb
@@ -46,7 +46,7 @@ arhivZav.ToString)
             If d.Name = ComboBox1.Text Then
 
                 LabelSize.Text = Format(d.TotalSize / 1000 / 1000, "0").ToString + " MB"
-
+                TextBox1.Text = "Kartica_" + d.VolumeLabel.ToString
             End If
         Next
 
diff --git a/Podatki/GSI_DataCodes.txt b/Doc/GSI_DataCodes.txt
similarity index 100%
rename from Podatki/GSI_DataCodes.txt
rename to Doc/GSI_DataCodes.txt
diff --git a/Doc/Navodila-nastavitve.html b/Doc/Navodila-nastavitve.html
index 0fecd46..d7bd8bb 100644
--- a/Doc/Navodila-nastavitve.html
+++ b/Doc/Navodila-nastavitve.html
@@ -2942,6 +2942,7 @@ body,
         >
             <div class="github-markdown-content"><p><a href="Home.html">&lt;&lt; Nazaj (Home)</a></p>
 <h1 id="nastavitve">Nastavitve</h1>
+<p>V delu...</p>
 </div>
         </div>
             
diff --git a/Doc/Navodila-osnovna.html b/Doc/Navodila-osnovna.html
index 9674370..ce607eb 100644
--- a/Doc/Navodila-osnovna.html
+++ b/Doc/Navodila-osnovna.html
@@ -2953,9 +2953,22 @@ body,
 </ul>
 </li>
 </ul>
+<hr>
 <h2 id="delo-z-virtualna-karticoprojekti">Delo z Virtualna Kartico/Projekti</h2>
-<p>Program TPS1100 Convert procesira samo datoteke, ki so zapisane v mapi &quot;Virtualna Kartica&quot; ali v mapi projekta &quot;./Projekti/...&quot;.</p>
-<p>Pri uvažanju GSI Joba se izvorna datoteka najprej kopira v aktivno delovno mapo. Za obdelavo aplikacija nato izbere datoteko iz delovne mape in na ta način ohrani originalen zapis izvorne datoteke.</p>
+<p>Program TPS1100 Convert za procesiranje uporablja delovne mape, ki delujejo kot &quot;Virtualna Kartica&quot; ali kot mapa za projekt.</p>
+<p>Lokacije map so v isti mapi kjer je zagonska datoteka aplikacije &quot;TPS1100 Conver.exe&quot;.</p>
+<p><strong>Struktura Map:</strong></p>
+<p>|- <em><strong>.\TPS1100 Convert</strong></em>
+|--- \Doc - (Mapa z navodili)
+|--- \Projekti - (Mapa kjer so shranjeni projekti)
+|--- \Virtualna Kartica - (Mapa za GSI Jobe brez projekta - Privzeta lokacija za obdelavo)
+|--- \Zavarovanja - (Mapa kjer so shranjena zavarovanja ustvarjena z TPS1100 Convert aplikacijo)
+|- <em>TPS1100 Convert.exe</em> - Zagonska datoteka aplikacije
+|- <em>tps1100_kode.txt</em> - Datoteka z kodami za interpretacijo podatkov GSI
+|- <em>tps1100_projekti.txt</em> - Datoteka z indeksom projektov naloženih v TPS1100 Convert</p>
+<p>Za odpiranje Job-a iz Virtualne Kartice ali Projekta sledi navodilom v poglavju <a href="#odpri-job">Odpri Job</a></p>
+<p>Za dodajanje oz uvoz Job-a v Virtualno Kartico ali Projekt sledi navodilom v poglavju <a href="#uvozi-gsi-job">Uvozi GSI Job</a></p>
+<hr>
 <h2 id="odpri-job">Odpri Job</h2>
 <p>Obdelava GSI podatkov iz &quot;Virtualna Kartico&quot; ali aktivnega Projekt-a.</p>
 <ol>
@@ -2995,6 +3008,7 @@ body,
 <hr>
 <h2 id="uvozi-gsi-job">Uvozi GSI Job</h2>
 <p>Uvoz GSI job-a v Virtualno Kartico/Projekt.</p>
+<p>Pri izbiri &quot;Uvozi Job&quot; se pokazana izvorna datoteka GSI najprej kopira v mapo aktivnega projekta oz. virtualne kartice. Pred obdelavo aplikacija nato izbere datoteko iz delovne mape in na ta način ohrani originalno izvorno datoteko nedotaknjeno.</p>
 <ol>
 <li>Za pričetek obdelave najprej odpri job ali uvozi datoteko GSI, ki jo želiš pretvoriti. (Gumb: Odpri Job/Uvozi Job)</li>
 </ol>
@@ -3031,7 +3045,7 @@ body,
 <hr>
 <h2 id="pripravi-gsi-uvozi-seznam-točk-txtkoo-v-gsi">Pripravi GSI (Uvozi seznam točk TXT/KOO v GSI)</h2>
 <p><img src="file:///e:\_Boris\Git_YunoHost\TPS1100-Convert.wiki\Resources\Images\gumb_pripravigsi1.png" alt="pripravigsi"></p>
-<p>“Pripravi GSI” je orodje za pretvorbo KOO/TXT datotek s seznamom točk v GSI datoteko za uporabo na inštrumentu TPS1100.
+<p>“Uvozi Točke” je orodje za pretvorbo KOO/TXT datotek s seznamom točk v GSI datoteko za uporabo na inštrumentu TPS1100.
 Datoteka seznama točk je lahko KOO ali TXT. Podatki točk morajo biti zapisani v obliki:</p>
 <p>Vrstni red podatkov: PtID, E, N, H</p>
 <pre><code>PT1001  466780.456  123456.456  300.000
diff --git a/Form1.Designer.vb b/Form1.Designer.vb
index 73a2d8e..43c73b1 100644
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@@ -33,8 +33,8 @@ Partial Class Form1
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.ToolStripButtonpROJ = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButtonPripravi = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
@@ -168,11 +168,6 @@ Partial Class Form1
         Me.ToolStripButtonpROJ.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         Me.ToolStripButtonpROJ.ToolTipText = "Urejenje projektov"
         '
-        'ToolStripSeparator8
-        '
-        Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
-        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 52)
-        '
         'ToolStripButton2
         '
         Me.ToolStripButton2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_product_documents_50
@@ -183,6 +178,11 @@ Partial Class Form1
         Me.ToolStripButton2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
         Me.ToolStripButton2.ToolTipText = "Izberi Job iz projekta..."
         '
+        'ToolStripSeparator8
+        '
+        Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
+        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 52)
+        '
         'tsbOpenFile
         '
         Me.tsbOpenFile.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_move_to_folder_50
@@ -302,33 +302,33 @@ Partial Class Form1
         '
         Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_tools_50
         Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem"
-        Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve"
         Me.OdpriGSIToolStripMenuItem.ToolTipText = "Odpri Nastavitve aplikacije..."
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(146, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6)
         '
         'PripraviGSIToolStripMenuItem
         '
         Me.PripraviGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48
         Me.PripraviGSIToolStripMenuItem.Name = "PripraviGSIToolStripMenuItem"
-        Me.PripraviGSIToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.PripraviGSIToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.PripraviGSIToolStripMenuItem.Text = "Navodila"
         Me.PripraviGSIToolStripMenuItem.ToolTipText = "Odpri navodila za uporabo aplikacije..."
         '
         'ToolStripSeparator7
         '
         Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
-        Me.ToolStripSeparator7.Size = New System.Drawing.Size(146, 6)
+        Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6)
         '
         'PosodobitevToolStripMenuItem
         '
         Me.PosodobitevToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_rotate_48
         Me.PosodobitevToolStripMenuItem.Name = "PosodobitevToolStripMenuItem"
-        Me.PosodobitevToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.PosodobitevToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.PosodobitevToolStripMenuItem.Text = "Posodobitev..."
         Me.PosodobitevToolStripMenuItem.ToolTipText = "Preveri za nove posodobitve..."
         '
@@ -336,20 +336,20 @@ Partial Class Form1
         '
         Me.InfoOAplikacijiToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_information_50
         Me.InfoOAplikacijiToolStripMenuItem.Name = "InfoOAplikacijiToolStripMenuItem"
-        Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.InfoOAplikacijiToolStripMenuItem.Text = "Info"
         Me.InfoOAplikacijiToolStripMenuItem.ToolTipText = "Pokaži podatke o aplikaciji..."
         '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(146, 6)
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(177, 6)
         '
         'IzhodToolStripMenuItem
         '
         Me.IzhodToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
         Me.IzhodToolStripMenuItem.Name = "IzhodToolStripMenuItem"
-        Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.IzhodToolStripMenuItem.Text = "I&zhod"
         Me.IzhodToolStripMenuItem.ToolTipText = "Izhod iz programa..."
         '
@@ -423,10 +423,10 @@ Partial Class Form1
         '
         'PripraviKarticoToolStripMenuItem
         '
-        Me.PripraviKarticoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbPripravaFormat, Me.ToolStripSeparator3, Me.tsbPripravaZav, Me.tsbMapaZav})
+        Me.PripraviKarticoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbPripravaFormat, Me.tsbPripravaZav, Me.ToolStripSeparator3, Me.tsbMapaZav})
         Me.PripraviKarticoToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_sd_50
         Me.PripraviKarticoToolStripMenuItem.Name = "PripraviKarticoToolStripMenuItem"
-        Me.PripraviKarticoToolStripMenuItem.Size = New System.Drawing.Size(130, 22)
+        Me.PripraviKarticoToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.PripraviKarticoToolStripMenuItem.Text = "PC-Kartica"
         Me.PripraviKarticoToolStripMenuItem.ToolTipText = "Pripravi kartico instrumenta za delo..."
         '
@@ -434,28 +434,28 @@ Partial Class Form1
         '
         Me.tsbPripravaFormat.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_micro_sd_50
         Me.tsbPripravaFormat.Name = "tsbPripravaFormat"
-        Me.tsbPripravaFormat.Size = New System.Drawing.Size(191, 22)
+        Me.tsbPripravaFormat.Size = New System.Drawing.Size(180, 22)
         Me.tsbPripravaFormat.Text = "Priprava Kartice"
         Me.tsbPripravaFormat.ToolTipText = "Pripravi kartico za delo z instrumentom..."
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(188, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6)
         '
         'tsbPripravaZav
         '
-        Me.tsbPripravaZav.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_program_50
+        Me.tsbPripravaZav.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_add_to_collection_50
         Me.tsbPripravaZav.Name = "tsbPripravaZav"
-        Me.tsbPripravaZav.Size = New System.Drawing.Size(191, 22)
-        Me.tsbPripravaZav.Text = "Zavarovanje Podatkov"
+        Me.tsbPripravaZav.Size = New System.Drawing.Size(180, 22)
+        Me.tsbPripravaZav.Text = "Zavarovanje Kartive"
         Me.tsbPripravaZav.ToolTipText = "Zavaruj podatke kartice v zavarovanja..."
         '
         'tsbMapaZav
         '
         Me.tsbMapaZav.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_browse_folder_50_2
         Me.tsbMapaZav.Name = "tsbMapaZav"
-        Me.tsbMapaZav.Size = New System.Drawing.Size(191, 22)
+        Me.tsbMapaZav.Size = New System.Drawing.Size(180, 22)
         Me.tsbMapaZav.Text = "Pokaži Mapo..."
         Me.tsbMapaZav.ToolTipText = "Odpri mapo z zavarovanji podatkov..."
         '
diff --git a/FormGrafika.Designer.vb b/FormGrafika.Designer.vb
index 0bc363a..15bd995 100644
--- a/FormGrafika.Designer.vb
+++ b/FormGrafika.Designer.vb
@@ -26,22 +26,28 @@ Partial Class FormGrafika
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label2 = New System.Windows.Forms.Label()
         Me.SuspendLayout()
         '
         'Button1
         '
         Me.Button1.FlatAppearance.BorderColor = System.Drawing.SystemColors.ButtonShadow
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(1036, 30)
+        Me.Button1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_mesh_48
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button1.Location = New System.Drawing.Point(1046, 13)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(165, 23)
+        Me.Button1.Size = New System.Drawing.Size(165, 60)
         Me.Button1.TabIndex = 0
-        Me.Button1.Text = "Prikaži"
+        Me.Button1.Text = "&Prikaži"
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
         Me.Button1.UseVisualStyleBackColor = True
         '
         'Label1
         '
-        Me.Label1.Location = New System.Drawing.Point(1087, 58)
+        Me.Label1.Location = New System.Drawing.Point(1099, 152)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(39, 20)
         Me.Label1.TabIndex = 1
@@ -51,31 +57,64 @@ Partial Class FormGrafika
         'Label4
         '
         Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label4.Location = New System.Drawing.Point(1036, 56)
+        Me.Label4.Location = New System.Drawing.Point(2147, 148)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(45, 22)
         Me.Label4.TabIndex = 4
         Me.Label4.Text = "Sojišča:"
         Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
+        'Button2
+        '
+        Me.Button2.FlatAppearance.BorderColor = System.Drawing.SystemColors.ButtonShadow
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_24
+        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button2.Location = New System.Drawing.Point(1046, 79)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(165, 36)
+        Me.Button2.TabIndex = 1
+        Me.Button2.Text = "&Zapri"
+        Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button2.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(1046, 156)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(47, 13)
+        Me.Label2.TabIndex = 5
+        Me.Label2.Text = "Stojišča:"
+        '
         'FormGrafika
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1224, 1061)
+        Me.ClientSize = New System.Drawing.Size(1224, 1011)
+        Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.Label4)
         Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.Button1)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximumSize = New System.Drawing.Size(1240, 1050)
+        Me.MinimumSize = New System.Drawing.Size(1240, 1050)
         Me.Name = "FormGrafika"
-        Me.Padding = New System.Windows.Forms.Padding(20)
+        Me.Padding = New System.Windows.Forms.Padding(10)
+        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "TPS1100 - Grafika"
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents Button1 As Button
     Friend WithEvents Label1 As Label
     Friend WithEvents Label4 As Label
+    Friend WithEvents Button2 As Button
+    Friend WithEvents Label2 As Label
 End Class
diff --git a/FormGrafika.vb b/FormGrafika.vb
index ab6c1c0..c569167 100644
--- a/FormGrafika.vb
+++ b/FormGrafika.vb
@@ -8,12 +8,20 @@ Public Class FormGrafika
 
     End Sub
 
+    ' Gumb: Prikaži
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         GrafikaIzris()
+        Form1.tsbSaveAs.Enabled = False
+    End Sub
+
+    ' Gumb: Zapri
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Me.Dispose()
+        Me.Close()
     End Sub
 
     Public Sub DrawLineMer(ByVal xPos As Single, ByVal yPos As Single, ByVal xPos2 As Single, ByVal yPos2 As Single)
-        g.DrawLine(Pens.LightCoral, New Point(xPos, yPos), New Point(xPos2, yPos2))
+        g.DrawLine(Pens.LightGray, New Point(xPos, yPos), New Point(xPos2, yPos2))
 
     End Sub
 
@@ -27,6 +35,7 @@ Public Class FormGrafika
 
         Form1.RichTextBox1.Clear()
         Form1.RichTextBox1.BackColor = Color.PaleTurquoise
+        Form1.RichTextBox1.Text = "Koordinate točk v grafiki..." + vbCrLf
         Dim streamReader As StreamReader = New StreamReader(Form1.OpenFileDialog1.FileName)
         Dim i As Integer = 0
         Dim lin As Integer = 0
@@ -41,6 +50,8 @@ Public Class FormGrafika
         Dim merY As Double = 0
         Dim imeToc As String = ""
 
+        g.DrawRectangle(Pens.Gray, 5, 5, 1000, 1000)
+
         Do Until streamReader.EndOfStream
             Form1.ToolStripProgressBar1.Value = i
             ' Read and Split each line to separate it into fields
@@ -112,15 +123,15 @@ Public Class FormGrafika
                         End If
                         If measuredPoints = 2 Then
                             Form1.RichTextBox1.AppendText(dataStolpci + "MEAS")
-                            g.DrawRectangle(Pens.Blue, CInt(merX) + 30, CInt(merY) + 30, 3, 3)
-                            g.DrawString(imeToc, DefaultFont, Brushes.Blue, CInt(merX) + 33, CInt(merY) + 33)
+                            g.DrawRectangle(Pens.Blue, CInt(merX) + 19, CInt(merY) + 19, 2, 2)
+                            g.DrawString(imeToc, DefaultFont, Brushes.Blue, CInt(merX) + 22, CInt(merY) + 22)
                             ' ElseIf measuredPoints = 4 Then
                             '     Form1.RichTextBox1.AppendText(dataStolpci + data + dataStolpci + "REF")
                         ElseIf measuredPoints = 3 Then
                             Form1.RichTextBox1.AppendText(dataStolpci + "ORI")
-                            g.DrawRectangle(Pens.DarkMagenta, CInt(merX) + 30, CInt(merY) + 30, 3, 3)
-                            g.DrawString(imeToc, DefaultFont, Brushes.DarkMagenta, CInt(merX) + 33, CInt(merY) + 33)
-                            DrawLineMer(CInt(staX) + 30, CInt(staY) + 30, CInt(merX) + 30, CInt(merY) + 30)
+                            g.DrawRectangle(Pens.DarkMagenta, CInt(merX) + 19, CInt(merY) + 19, 2, 2)
+                            g.DrawString(imeToc, DefaultFont, Brushes.Magenta, CInt(merX) + 22, CInt(merY) + 22)
+                            DrawLineMer(CInt(staX) + 20, CInt(staY) + 20, CInt(merX) + 20, CInt(merY) + 20)
                         End If
                         If stojiceSt > 0 Then
                             meritevSt = meritevSt + 1
@@ -151,8 +162,8 @@ Public Class FormGrafika
                         stojiceSt = stojiceSt + 1
                         meritevSt = 0
                         Label1.Text = stojiceSt.ToString
-                        g.DrawRectangle(Pens.Red, CInt(staX) + 30, CInt(staY) + 30, 5, 5)
-                        g.DrawString(imeToc, DefaultFont, Brushes.Red, CInt(staX) + 35, CInt(staY) + 35)
+                        g.DrawRectangle(Pens.DarkOrange, CInt(staX) + 18, CInt(staY) + 18, 4, 4)
+                        g.DrawString(imeToc, DefaultFont, Brushes.DarkOrange, CInt(staX) + 25, CInt(staY) + 25)
                     Else
                         numData = 0
                         data = ""
diff --git a/FormGsiJobs.Designer.vb b/FormGsiJobs.Designer.vb
index a760e6d..60784af 100644
--- a/FormGsiJobs.Designer.vb
+++ b/FormGsiJobs.Designer.vb
@@ -22,6 +22,7 @@ Partial Class FormGsiJobs
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormGsiJobs))
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
@@ -53,15 +54,23 @@ Partial Class FormGsiJobs
         Me.Label8 = New System.Windows.Forms.Label()
         Me.ListViewProj = New System.Windows.Forms.ListView()
         Me.ProjektImeHeader = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ProjektMapaHeader = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
         Me.ListView2 = New System.Windows.Forms.ListView()
         Me.JobImeHeader = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
         Me.OpenFileDialogUvoziJob = New System.Windows.Forms.OpenFileDialog()
         Me.TextBoxJobDat = New System.Windows.Forms.TextBox()
         Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
+        Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStrip3 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripButton6 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton7 = New System.Windows.Forms.ToolStripButton()
+        Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
         Me.ToolStrip1.SuspendLayout()
         Me.TableLayoutPanel1.SuspendLayout()
         Me.TableLayoutPanel2.SuspendLayout()
+        Me.ToolStrip2.SuspendLayout()
+        Me.ToolStrip3.SuspendLayout()
         Me.SuspendLayout()
         '
         'StatusStrip1
@@ -152,7 +161,7 @@ Partial Class FormGsiJobs
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label1.Location = New System.Drawing.Point(9, 56)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(150, 26)
+        Me.Label1.Size = New System.Drawing.Size(164, 26)
         Me.Label1.TabIndex = 8
         Me.Label1.Text = "Projekt"
         Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -160,9 +169,9 @@ Partial Class FormGsiJobs
         'Label2
         '
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(165, 56)
+        Me.Label2.Location = New System.Drawing.Point(179, 56)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(153, 26)
+        Me.Label2.Size = New System.Drawing.Size(160, 26)
         Me.Label2.TabIndex = 9
         Me.Label2.Text = "Job (GSI)"
         Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -170,9 +179,9 @@ Partial Class FormGsiJobs
         'Label3
         '
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(324, 56)
+        Me.Label3.Location = New System.Drawing.Point(345, 56)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(368, 26)
+        Me.Label3.Size = New System.Drawing.Size(347, 26)
         Me.Label3.TabIndex = 10
         Me.Label3.Text = "Podatki"
         Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -197,7 +206,7 @@ Partial Class FormGsiJobs
         Me.TableLayoutPanel1.Controls.Add(Me.ButtonDelovni, 0, 2)
         Me.TableLayoutPanel1.Controls.Add(Me.Label12, 1, 2)
         Me.TableLayoutPanel1.Controls.Add(Me.LabelJobIme, 1, 6)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(324, 86)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(345, 86)
         Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
         Me.TableLayoutPanel1.RowCount = 7
         Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
@@ -207,129 +216,111 @@ Partial Class FormGsiJobs
         Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
         Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
         Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(368, 181)
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(347, 181)
         Me.TableLayoutPanel1.TabIndex = 11
         '
         'Label4
         '
-        Me.Label4.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label4.AutoSize = True
         Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(3, 0)
+        Me.Label4.Location = New System.Drawing.Point(3, 4)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(113, 25)
+        Me.Label4.Size = New System.Drawing.Size(113, 16)
         Me.Label4.TabIndex = 0
         Me.Label4.Text = "Delovni Projekt"
         Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'Label6
         '
-        Me.Label6.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(3, 25)
+        Me.Label6.Location = New System.Drawing.Point(3, 31)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(113, 25)
+        Me.Label6.Size = New System.Drawing.Size(113, 13)
         Me.Label6.TabIndex = 2
         Me.Label6.Text = "Delovna Mapa"
         Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'LabelDeloProj
         '
-        Me.LabelDeloProj.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelDeloProj.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelDeloProj.AutoSize = True
         Me.LabelDeloProj.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.LabelDeloProj.ForeColor = System.Drawing.Color.ForestGreen
-        Me.LabelDeloProj.Location = New System.Drawing.Point(122, 0)
+        Me.LabelDeloProj.Location = New System.Drawing.Point(122, 4)
         Me.LabelDeloProj.Name = "LabelDeloProj"
-        Me.LabelDeloProj.Size = New System.Drawing.Size(243, 25)
+        Me.LabelDeloProj.Size = New System.Drawing.Size(222, 16)
         Me.LabelDeloProj.TabIndex = 6
         Me.LabelDeloProj.Text = "<delovni projekt>"
         Me.LabelDeloProj.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'LabelDeloMapa
         '
-        Me.LabelDeloMapa.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelDeloMapa.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelDeloMapa.AutoSize = True
-        Me.LabelDeloMapa.Location = New System.Drawing.Point(122, 25)
+        Me.LabelDeloMapa.Location = New System.Drawing.Point(122, 31)
         Me.LabelDeloMapa.Name = "LabelDeloMapa"
-        Me.LabelDeloMapa.Size = New System.Drawing.Size(243, 25)
+        Me.LabelDeloMapa.Size = New System.Drawing.Size(222, 13)
         Me.LabelDeloMapa.TabIndex = 7
         Me.LabelDeloMapa.Text = "<delovna mapa>"
         Me.LabelDeloMapa.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'Label7
         '
-        Me.Label7.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(3, 100)
+        Me.Label7.Location = New System.Drawing.Point(3, 106)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(113, 25)
+        Me.Label7.Size = New System.Drawing.Size(113, 13)
         Me.Label7.TabIndex = 5
         Me.Label7.Text = "Lokacija"
         Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'Label5
         '
-        Me.Label5.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label5.AutoSize = True
         Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(3, 75)
+        Me.Label5.Location = New System.Drawing.Point(3, 80)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(113, 25)
+        Me.Label5.Size = New System.Drawing.Size(113, 15)
         Me.Label5.TabIndex = 4
         Me.Label5.Text = "Izbran Projekt"
         Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'LabelIzbProjMapa
         '
-        Me.LabelIzbProjMapa.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelIzbProjMapa.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelIzbProjMapa.AutoSize = True
-        Me.LabelIzbProjMapa.Location = New System.Drawing.Point(122, 100)
+        Me.LabelIzbProjMapa.Location = New System.Drawing.Point(122, 106)
         Me.LabelIzbProjMapa.Name = "LabelIzbProjMapa"
-        Me.LabelIzbProjMapa.Size = New System.Drawing.Size(243, 25)
+        Me.LabelIzbProjMapa.Size = New System.Drawing.Size(222, 13)
         Me.LabelIzbProjMapa.TabIndex = 3
         Me.LabelIzbProjMapa.Text = ".\"
         Me.LabelIzbProjMapa.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'LabelIzbProj
         '
-        Me.LabelIzbProj.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelIzbProj.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelIzbProj.AutoSize = True
         Me.LabelIzbProj.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.LabelIzbProj.ForeColor = System.Drawing.Color.SteelBlue
-        Me.LabelIzbProj.Location = New System.Drawing.Point(122, 75)
+        Me.LabelIzbProj.Location = New System.Drawing.Point(122, 80)
         Me.LabelIzbProj.Name = "LabelIzbProj"
-        Me.LabelIzbProj.Size = New System.Drawing.Size(243, 25)
+        Me.LabelIzbProj.Size = New System.Drawing.Size(222, 15)
         Me.LabelIzbProj.TabIndex = 1
         Me.LabelIzbProj.Text = "(izberi projekt)"
         Me.LabelIzbProj.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'Label10
         '
-        Me.Label10.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label10.AutoSize = True
         Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label10.Location = New System.Drawing.Point(3, 150)
+        Me.Label10.Location = New System.Drawing.Point(3, 159)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(113, 31)
+        Me.Label10.Size = New System.Drawing.Size(113, 13)
         Me.Label10.TabIndex = 8
         Me.Label10.Text = "Izbran Job"
         Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -356,62 +347,60 @@ Partial Class FormGsiJobs
         Me.Label12.ForeColor = System.Drawing.SystemColors.ControlDarkDark
         Me.Label12.Location = New System.Drawing.Point(122, 50)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(243, 25)
+        Me.Label12.Size = New System.Drawing.Size(222, 25)
         Me.Label12.TabIndex = 11
         Me.Label12.Text = "Nastavi izbran projekt kot delovni"
         Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'LabelJobIme
         '
-        Me.LabelJobIme.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelJobIme.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LabelJobIme.AutoSize = True
         Me.LabelJobIme.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.LabelJobIme.ForeColor = System.Drawing.Color.RoyalBlue
-        Me.LabelJobIme.Location = New System.Drawing.Point(122, 150)
+        Me.LabelJobIme.ForeColor = System.Drawing.Color.DarkOrange
+        Me.LabelJobIme.Location = New System.Drawing.Point(122, 159)
         Me.LabelJobIme.Name = "LabelJobIme"
-        Me.LabelJobIme.Size = New System.Drawing.Size(243, 31)
+        Me.LabelJobIme.Size = New System.Drawing.Size(222, 13)
         Me.LabelJobIme.TabIndex = 12
         Me.LabelJobIme.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'ButtonNalJob2
         '
+        Me.ButtonNalJob2.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ButtonNalJob2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.ButtonNalJob2.Enabled = False
         Me.ButtonNalJob2.FlatAppearance.BorderSize = 0
         Me.ButtonNalJob2.FlatAppearance.MouseOverBackColor = System.Drawing.SystemColors.ActiveCaption
         Me.ButtonNalJob2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.ButtonNalJob2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
-        Me.ButtonNalJob2.Location = New System.Drawing.Point(0, 40)
+        Me.ButtonNalJob2.Location = New System.Drawing.Point(0, 67)
         Me.ButtonNalJob2.Margin = New System.Windows.Forms.Padding(0)
         Me.ButtonNalJob2.Name = "ButtonNalJob2"
         Me.ButtonNalJob2.Padding = New System.Windows.Forms.Padding(3)
-        Me.ButtonNalJob2.Size = New System.Drawing.Size(368, 91)
+        Me.ButtonNalJob2.Size = New System.Drawing.Size(347, 59)
         Me.ButtonNalJob2.TabIndex = 14
         Me.ButtonNalJob2.Text = "Naloži Job"
-        Me.ButtonNalJob2.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.ButtonNalJob2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.ButtonNalJob2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
         Me.ButtonNalJob2.UseVisualStyleBackColor = True
         '
         'Label8
         '
-        Me.Label8.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label8.AutoSize = True
         Me.Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.Label8.Location = New System.Drawing.Point(3, 23)
+        Me.Label8.Location = New System.Drawing.Point(3, 31)
         Me.Label8.Margin = New System.Windows.Forms.Padding(3)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(362, 14)
+        Me.Label8.Size = New System.Drawing.Size(341, 13)
         Me.Label8.TabIndex = 15
         Me.Label8.Text = "Naloži izbran Job za obdelavo"
-        Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'ListViewProj
         '
         Me.ListViewProj.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.ListViewProj.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ProjektImeHeader, Me.ProjektMapaHeader})
+        Me.ListViewProj.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ProjektImeHeader})
         Me.ListViewProj.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.ListViewProj.FullRowSelect = True
         Me.ListViewProj.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
@@ -420,20 +409,16 @@ Partial Class FormGsiJobs
         Me.ListViewProj.Location = New System.Drawing.Point(13, 86)
         Me.ListViewProj.MultiSelect = False
         Me.ListViewProj.Name = "ListViewProj"
-        Me.ListViewProj.Size = New System.Drawing.Size(146, 330)
+        Me.ListViewProj.Size = New System.Drawing.Size(160, 290)
         Me.ListViewProj.TabIndex = 12
         Me.ListViewProj.UseCompatibleStateImageBehavior = False
-        Me.ListViewProj.View = System.Windows.Forms.View.List
+        Me.ListViewProj.View = System.Windows.Forms.View.Details
         '
         'ProjektImeHeader
         '
         Me.ProjektImeHeader.Text = "Projekt Ime"
         Me.ProjektImeHeader.Width = 140
         '
-        'ProjektMapaHeader
-        '
-        Me.ProjektMapaHeader.Text = "Mapa"
-        '
         'ListView2
         '
         Me.ListView2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
@@ -442,9 +427,11 @@ Partial Class FormGsiJobs
         Me.ListView2.FullRowSelect = True
         Me.ListView2.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
         Me.ListView2.HideSelection = False
-        Me.ListView2.Location = New System.Drawing.Point(165, 86)
+        Me.ListView2.LargeImageList = Me.ImageList1
+        Me.ListView2.Location = New System.Drawing.Point(179, 85)
+        Me.ListView2.MultiSelect = False
         Me.ListView2.Name = "ListView2"
-        Me.ListView2.Size = New System.Drawing.Size(153, 330)
+        Me.ListView2.Size = New System.Drawing.Size(160, 290)
         Me.ListView2.TabIndex = 13
         Me.ListView2.UseCompatibleStateImageBehavior = False
         Me.ListView2.View = System.Windows.Forms.View.List
@@ -460,12 +447,17 @@ Partial Class FormGsiJobs
         '
         'TextBoxJobDat
         '
-        Me.TextBoxJobDat.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.TextBoxJobDat.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.TextBoxJobDat.BackColor = System.Drawing.SystemColors.Control
+        Me.TextBoxJobDat.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.TextBoxJobDat.Cursor = System.Windows.Forms.Cursors.IBeam
         Me.TextBoxJobDat.Location = New System.Drawing.Point(10, 5)
         Me.TextBoxJobDat.Margin = New System.Windows.Forms.Padding(10, 5, 10, 0)
         Me.TextBoxJobDat.Name = "TextBoxJobDat"
         Me.TextBoxJobDat.ReadOnly = True
-        Me.TextBoxJobDat.Size = New System.Drawing.Size(348, 13)
+        Me.TextBoxJobDat.Size = New System.Drawing.Size(327, 20)
         Me.TextBoxJobDat.TabIndex = 16
         Me.TextBoxJobDat.WordWrap = False
         '
@@ -476,20 +468,100 @@ Partial Class FormGsiJobs
         Me.TableLayoutPanel2.Controls.Add(Me.Label8, 0, 1)
         Me.TableLayoutPanel2.Controls.Add(Me.ButtonNalJob2, 0, 2)
         Me.TableLayoutPanel2.Controls.Add(Me.TextBoxJobDat, 0, 0)
-        Me.TableLayoutPanel2.Location = New System.Drawing.Point(324, 273)
+        Me.TableLayoutPanel2.Location = New System.Drawing.Point(345, 273)
         Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
         Me.TableLayoutPanel2.RowCount = 3
-        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
-        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
         Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle())
-        Me.TableLayoutPanel2.Size = New System.Drawing.Size(368, 143)
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(347, 143)
         Me.TableLayoutPanel2.TabIndex = 14
         '
+        'ToolStrip2
+        '
+        Me.ToolStrip2.AutoSize = False
+        Me.ToolStrip2.Dock = System.Windows.Forms.DockStyle.None
+        Me.ToolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip2.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton2, Me.ToolStripButton1})
+        Me.ToolStrip2.Location = New System.Drawing.Point(13, 381)
+        Me.ToolStrip2.Name = "ToolStrip2"
+        Me.ToolStrip2.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
+        Me.ToolStrip2.Size = New System.Drawing.Size(160, 35)
+        Me.ToolStrip2.TabIndex = 15
+        Me.ToolStrip2.Text = "ToolStrip2"
+        '
+        'ToolStripButton2
+        '
+        Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton2.Enabled = False
+        Me.ToolStripButton2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_remove_50
+        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton2.Name = "ToolStripButton2"
+        Me.ToolStripButton2.Size = New System.Drawing.Size(28, 32)
+        Me.ToolStripButton2.Text = "Odstrani Projekt"
+        Me.ToolStripButton2.ToolTipText = "Odstrani Projekt"
+        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton1.Enabled = False
+        Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_add_to_collection_50
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 32)
+        Me.ToolStripButton1.Text = "ToolStripButton1"
+        Me.ToolStripButton1.ToolTipText = "Naredi zavarovanje projekta..."
+        '
+        'ToolStrip3
+        '
+        Me.ToolStrip3.AutoSize = False
+        Me.ToolStrip3.Dock = System.Windows.Forms.DockStyle.None
+        Me.ToolStrip3.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip3.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.ToolStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton6, Me.ToolStripButton7})
+        Me.ToolStrip3.Location = New System.Drawing.Point(179, 381)
+        Me.ToolStrip3.Name = "ToolStrip3"
+        Me.ToolStrip3.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
+        Me.ToolStrip3.Size = New System.Drawing.Size(160, 38)
+        Me.ToolStrip3.TabIndex = 15
+        Me.ToolStrip3.Text = "ToolStrip2"
+        '
+        'ToolStripButton6
+        '
+        Me.ToolStripButton6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton6.Enabled = False
+        Me.ToolStripButton6.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_recycle_bin_50
+        Me.ToolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton6.Name = "ToolStripButton6"
+        Me.ToolStripButton6.Size = New System.Drawing.Size(28, 35)
+        Me.ToolStripButton6.Text = "ToolStripButton2"
+        Me.ToolStripButton6.ToolTipText = "Izbrišii Job"
+        '
+        'ToolStripButton7
+        '
+        Me.ToolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton7.Enabled = False
+        Me.ToolStripButton7.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_product_documents_50
+        Me.ToolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton7.Name = "ToolStripButton7"
+        Me.ToolStripButton7.Size = New System.Drawing.Size(28, 35)
+        Me.ToolStripButton7.Text = "ToolStripButton1"
+        Me.ToolStripButton7.ToolTipText = "Arhiviraj Job"
+        '
+        'ImageList1
+        '
+        Me.ImageList1.ImageStream = CType(resources.GetObject("ImageList1.ImageStream"), System.Windows.Forms.ImageListStreamer)
+        Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent
+        Me.ImageList1.Images.SetKeyName(0, "icons8-file-GSI-50.png")
+        '
         'FormGsiJobs
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(704, 441)
+        Me.Controls.Add(Me.ToolStrip3)
+        Me.Controls.Add(Me.ToolStrip2)
         Me.Controls.Add(Me.TableLayoutPanel2)
         Me.Controls.Add(Me.ListView2)
         Me.Controls.Add(Me.ListViewProj)
@@ -513,6 +585,10 @@ Partial Class FormGsiJobs
         Me.TableLayoutPanel1.PerformLayout()
         Me.TableLayoutPanel2.ResumeLayout(False)
         Me.TableLayoutPanel2.PerformLayout()
+        Me.ToolStrip2.ResumeLayout(False)
+        Me.ToolStrip2.PerformLayout()
+        Me.ToolStrip3.ResumeLayout(False)
+        Me.ToolStrip3.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -546,11 +622,17 @@ Partial Class FormGsiJobs
     Friend WithEvents ToolStripButton5 As ToolStripButton
     Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
     Friend WithEvents JobImeHeader As ColumnHeader
-    Friend WithEvents ProjektMapaHeader As ColumnHeader
     Friend WithEvents OpenFileDialogUvoziJob As OpenFileDialog
     Friend WithEvents LabelJobIme As Label
     Friend WithEvents ButtonNalJob2 As Button
     Friend WithEvents Label8 As Label
     Friend WithEvents TextBoxJobDat As TextBox
     Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
+    Friend WithEvents ToolStrip2 As ToolStrip
+    Friend WithEvents ToolStripButton2 As ToolStripButton
+    Friend WithEvents ToolStripButton1 As ToolStripButton
+    Friend WithEvents ToolStrip3 As ToolStrip
+    Friend WithEvents ToolStripButton6 As ToolStripButton
+    Friend WithEvents ToolStripButton7 As ToolStripButton
+    Friend WithEvents ImageList1 As ImageList
 End Class
diff --git a/FormGsiJobs.resx b/FormGsiJobs.resx
index 5fdb39e..0e98168 100644
--- a/FormGsiJobs.resx
+++ b/FormGsiJobs.resx
@@ -118,13 +118,64 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>132, 17</value>
+    <value>128, 17</value>
   </metadata>
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>248, 17</value>
+    <value>244, 17</value>
   </metadata>
+  <metadata name="ImageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="ImageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8
+        BwAAAk1TRnQBSQFMAwEBAAEIAQABCAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
+        AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
+        AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
+        AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ
+        AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm
+        AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz
+        AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm
+        AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm
+        AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA
+        ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm
+        AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm
+        ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm
+        AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA
+        AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ
+        AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz
+        AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/
+        AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA
+        AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM
+        AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm
+        ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ
+        AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/
+        ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM
+        ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm
+        AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM
+        AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA
+        AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA
+        ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7
+        Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/9EAAH/CegB/zUAAeEB/wKz
+        Af8CswH/AbkB/wH0NQAB4QHfAegBAgH/AYoB/wKzAf8B9DUAAeEB3wHoAQID/wHoAbMB/wH0NQAB4QHf
+        AegB2gHfAf8BswH/AbMB/wH0NQAB4QHfAugB/wGKAv8BswH/AfQ1AAHhAd8B6AECAf8BigH/ArMB/wH0
+        NQAB4Qn/AfQ1AAHhCf8B9DUAAeEF/wHfA7MB9TUAAeEG/wLOAfQ2AAHhBv8BzgH1NwAB4Qb/AfW1AAFC
+        AU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wYAAeABAwYAAeABAwYAAeABAwYA
+        AeABAwYAAeABAwYAAeABAwYAAeABAwYAAeABAwYAAeABAwYAAeABAwYAAeABBwYAAeABDwYAAeABHwYA
+        Av8GAAL/BgAL
+</value>
+  </data>
   <metadata name="OpenFileDialogUvoziJob.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>354, 17</value>
+    <value>350, 17</value>
+  </metadata>
+  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>532, 17</value>
+  </metadata>
+  <metadata name="ToolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>638, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/FormGsiJobs.vb b/FormGsiJobs.vb
index a48e9c0..c68b531 100644
--- a/FormGsiJobs.vb
+++ b/FormGsiJobs.vb
@@ -54,8 +54,8 @@ Public Class FormGsiJobs
             ' Izvoz kodiranja v TXT datoteko
             Dim dataNast As String = ""
 
-            dataNast = dataNast + "Virtualna Kartica=\Virtualna Kartica\GSI" + vbCrLf
-            dataNast = dataNast + "Test Projekt=\Projekti\Test Projekt" + vbCrLf
+            dataNast = dataNast + "Virtualna Kartica=Virtualna Kartica\GSI" + vbCrLf
+            dataNast = dataNast + "Test Projekt=Projekti\Test Projekt" + vbCrLf
 
             My.Computer.FileSystem.WriteAllText(datProjektiNast, dataNast, False)
         End If
@@ -127,7 +127,7 @@ Public Class FormGsiJobs
         Me.Close()
     End Sub
 
-    Private Sub ListViewProj_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListViewProj.SelectedIndexChanged
+    Private Sub PreberiJobe()
         Dim izbran As ListView.SelectedListViewItemCollection = Me.ListViewProj.SelectedItems
         Dim item As ListViewItem
         Dim ime As String = ""
@@ -146,6 +146,21 @@ Public Class FormGsiJobs
         For Each datJob In datotekeJobi
             ListView2.Items.Add(Path.GetFileName(datJob).ToString).SubItems.Add(Path.GetFullPath(datJob))
         Next
+        If ime = "Virtualna Kartica" Then
+            ToolStripButton1.Enabled = False
+            ToolStripButton2.Enabled = False
+            ToolStripButton6.Enabled = False
+            ToolStripButton7.Enabled = False
+        Else
+            ToolStripButton1.Enabled = True
+            ToolStripButton2.Enabled = True
+            ToolStripButton6.Enabled = False
+            ToolStripButton7.Enabled = False
+        End If
+    End Sub
+
+    Private Sub ListViewProj_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListViewProj.SelectedIndexChanged
+        PreberiJobe()
     End Sub
 
     Private Sub ListViewProj_DoubleClick(sender As Object, e As EventArgs) Handles ListViewProj.DoubleClick
@@ -168,10 +183,14 @@ Public Class FormGsiJobs
         Next
         LabelJobIme.Text = ime.ToString
         TextBoxJobDat.Text = mapa.ToString
-        If LabelJobIme.Text > "" Then
-            ButtonNalJob2.Enabled = True
-        Else
+        If LabelJobIme.Text = "" Then
             ButtonNalJob2.Enabled = False
+            ToolStripButton6.Enabled = False
+            ToolStripButton7.Enabled = False
+        Else
+            ButtonNalJob2.Enabled = True
+            ToolStripButton6.Enabled = True
+            ToolStripButton7.Enabled = True
         End If
 
         'Dim delovnaJob = My.Application.Info.DirectoryPath.ToString + "\" + mapa.ToString
@@ -203,4 +222,42 @@ Public Class FormGsiJobs
 
     End Sub
 
+    Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click
+        ' Arhiviraj izbran job
+        Dim datIzb = TextBoxJobDat.Text
+        Dim datArh = datIzb.Replace(LabelJobIme.Text, "_ARHIV\" + LabelJobIme.Text)
+
+        Dim msgArh = MsgBox("Arhiviram job: " + LabelJobIme.Text, vbOKCancel, "Arhiviranje Job-a...")
+        If msgArh = DialogResult.OK Then
+            If My.Computer.FileSystem.FileExists(datIzb) Then
+                My.Computer.FileSystem.MoveFile(datIzb, datArh, True)
+            End If
+            ' Ponovno osveži vsebino seznama
+            PreberiJobe()
+        End If
+    End Sub
+
+    Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles ToolStripButton6.Click
+        ' Izbriši izbran job
+        Dim datIzb = TextBoxJobDat.Text
+
+        Dim msgArh = MsgBox("Izbrišem job: " + LabelJobIme.Text, vbOKCancel, "Brisanje Job-a...")
+        If msgArh = DialogResult.OK Then
+            If My.Computer.FileSystem.FileExists(datIzb) Then
+                My.Computer.FileSystem.DeleteFile(datIzb, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
+            End If
+            ' Ponovno osveži vsebino seznama
+            PreberiJobe()
+        End If
+    End Sub
+
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+        ' Arhiviraj izbran jprojekt
+
+    End Sub
+
+    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
+        ' Izbriši izbran projekt
+
+    End Sub
 End Class
\ No newline at end of file
diff --git a/My Project/Icons/icons8-add-to-collection-50.png b/My Project/Icons/icons8-add-to-collection-50.png
new file mode 100644
index 0000000..740379a
Binary files /dev/null and b/My Project/Icons/icons8-add-to-collection-50.png differ
diff --git a/My Project/Icons/icons8-recycle-bin-24.png b/My Project/Icons/icons8-recycle-bin-24.png
new file mode 100644
index 0000000..8d2886b
Binary files /dev/null and b/My Project/Icons/icons8-recycle-bin-24.png differ
diff --git a/My Project/Icons/icons8-remove-24.png b/My Project/Icons/icons8-remove-24.png
new file mode 100644
index 0000000..75f3b59
Binary files /dev/null and b/My Project/Icons/icons8-remove-24.png differ
diff --git a/My Project/Resources.Designer.vb b/My Project/Resources.Designer.vb
index cd9a155..7949f88 100644
--- a/My Project/Resources.Designer.vb	
+++ b/My Project/Resources.Designer.vb	
@@ -501,6 +501,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_add_to_collection_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-add-to-collection-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -981,6 +991,46 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_recycle_bin_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-recycle-bin-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_recycle_bin_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-recycle-bin-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_remove_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-remove-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_remove_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-remove-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
diff --git a/My Project/Resources.resx b/My Project/Resources.resx
index 66f703c..d2d9bd5 100644
--- a/My Project/Resources.resx	
+++ b/My Project/Resources.resx	
@@ -133,15 +133,15 @@
   <data name="48" xml:space="preserve">
     <value>Information 7</value>
   </data>
+  <data name="icons8-mesh-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-mesh-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8_undo_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-undo-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-compare-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-compare-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8_land_surveying_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-land-surveying-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icons8_info_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-info-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -178,8 +178,8 @@
   <data name="icons8-micro-sd-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-micro-sd-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8-check-file-501" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-check-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-sd-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-sd-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-folder-tree-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-folder-tree-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -193,6 +193,9 @@
   <data name="TPS1100CNVRT_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\TPS1100CNVRT_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8-remove-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-remove-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8-my-location-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-my-location-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -238,8 +241,8 @@
   <data name="icons8_folder_50_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-folder-50-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8_save_as_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-check-file-501" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-check-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8_close_window_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -259,9 +262,6 @@
   <data name="86" xml:space="preserve">
     <value>St. Height</value>
   </data>
-  <data name="icons8-product-documents-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-product-documents-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icons8_information_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-information-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -277,6 +277,9 @@
   <data name="icons8_clear_symbol_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="81" xml:space="preserve">
+    <value>Easting</value>
+  </data>
   <data name="icons8-support-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-support-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -313,8 +316,8 @@
   <data name="44" xml:space="preserve">
     <value>Information 3</value>
   </data>
-  <data name="icons8_open_end_wrench_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8_land_surveying_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-land-surveying-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="72" xml:space="preserve">
     <value>Remark 2</value>
@@ -349,8 +352,8 @@
   <data name="33" xml:space="preserve">
     <value>Height difference</value>
   </data>
-  <data name="88" xml:space="preserve">
-    <value>Instrument height</value>
+  <data name="icons8-move-to-folder-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-move-to-folder-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="25" xml:space="preserve">
     <value>Horizontal Angle Correction</value>
@@ -370,8 +373,14 @@
   <data name="icons8_no_entry_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icons8-sd-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-sd-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-recycle-bin-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-recycle-bin-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8_save_as_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-remove-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-remove-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-move-to-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -379,8 +388,11 @@
   <data name="README" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\README.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-  <data name="81" xml:space="preserve">
-    <value>Easting</value>
+  <data name="icons8_open_end_wrench_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-product-documents-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-product-documents-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8_connection_status_on_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -433,8 +445,11 @@
   <data name="32" xml:space="preserve">
     <value>Horizontal distance</value>
   </data>
-  <data name="icons8-mesh-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-mesh-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="88" xml:space="preserve">
+    <value>Instrument height</value>
+  </data>
+  <data name="icons8-recycle-bin-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-recycle-bin-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8_edit_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -454,7 +469,7 @@
   <data name="12" xml:space="preserve">
     <value>Serial number</value>
   </data>
-  <data name="icons8-move-to-folder-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-move-to-folder-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-add-to-collection-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-add-to-collection-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Podatki/Navodila.pdf b/Podatki/Navodila.pdf
deleted file mode 100644
index 2072c47..0000000
Binary files a/Podatki/Navodila.pdf and /dev/null differ
diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj
index e3f1607..c2ba593 100644
--- a/TPS1100 Convert.vbproj	
+++ b/TPS1100 Convert.vbproj	
@@ -31,7 +31,7 @@
     <MinimumRequiredVersion>2.1.0.4</MinimumRequiredVersion>
     <WebPage>publish.html</WebPage>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>2.8.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -327,6 +327,11 @@
     <None Include="My Project\Icons\icons8-close-24.png" />
     <None Include="My Project\Icons\icons8-product-documents-24.png" />
     <None Include="My Project\Icons\icons8-move-to-folder-24.png" />
+    <None Include="My Project\Icons\icons8-recycle-bin-24.png" />
+    <None Include="My Project\Icons\icons8-recycle-bin-50.png" />
+    <None Include="My Project\Icons\icons8-remove-24.png" />
+    <None Include="My Project\Icons\icons8-remove-50.png" />
+    <None Include="My Project\Icons\icons8-add-to-collection-50.png" />
     <Content Include="tps1100_projekti.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -348,9 +353,6 @@
     </None>
     <None Include="App.config" />
     <None Include="My Project\Icons\icons8-rotate-48.png" />
-    <Content Include="Podatki\Navodila.pdf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="README.md">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -452,7 +454,7 @@
     <None Include="My Project\Icons\icons8-send-file-50.png" />
     <None Include="My Project\Icons\icons8-support-50.png" />
     <None Include="My Project\Icons\icons8-question-mark-48.png" />
-    <AdditionalFiles Include="Podatki\GSI_DataCodes.txt">
+    <AdditionalFiles Include="Doc\GSI_DataCodes.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AdditionalFiles>
     <None Include="My Project\Icons\icons8-check-file-50.png" />
@@ -484,6 +486,7 @@
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Podatki\" />
     <Folder Include="Resources\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
diff --git a/Virtualna Kartica/GSI/TEST-JOB.GSI b/Virtualna Kartica/GSI/TEST-JOB.GSI
index f67fa02..7efacea 100644
--- a/Virtualna Kartica/GSI/TEST-JOB.GSI	
+++ b/Virtualna Kartica/GSI/TEST-JOB.GSI	
@@ -4,9 +4,9 @@
 *110003+00000000000GS003 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 
 *410000+0000000000000002 71....+0000000000000021 72....+0000000000001015 
 *410010+0000000000000040 
-*110004+00000000000GS001 21.324+0000000013831010 22.324+0000000008932340 31..00+0000000000029523 32..10+0000000000029522 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000754 81..00+0000000531242578 82..00+0000000073008189 83..00+0000000000800864 71....+0000000000000000 
-*110005+00000000000GS002 21.324+0000000019023040 22.324+0000000010338410 31..00+0000000000007115 32..10+0000000000006914 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000268 81..00+0000000531221776 82..00+0000000073023505 83..00+0000000000801350 71....+0000000000000000 
-*110006+00000000000GS003 21.324+0000000003614410 22.324+0000000009121020 31..00+0000000000034333 32..10+0000000000034324 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000531243315 82..00+0000000073057988 83..00+0000000000802219 71....+0000000000000000 
+*110004+00000000000GS001 21.324+0000000013831010 22.324+0000000008932340 31..00+0000000000029523 32..10+0000000000029522 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000754 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586 71....+0000000000000000 
+*110005+00000000000GS002 21.324+0000000019023040 22.324+0000000010338410 31..00+0000000000007115 32..10+0000000000006914 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000268 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107 71....+0000000000000000 
+*110006+00000000000GS003 21.324+0000000003614410 22.324+0000000009121020 31..00+0000000000034333 32..10+0000000000034324 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 71....+0000000000000000 
 *110007+0000000000011111 25.344+0000000008801190 84..40+0000000465444529 85..40+0000000110546554 86..40+0000000000302353 87..10+0000000000000100 88..10+0000000000001510 
 *410000+0000000000000080 
 *110008+00000000000GS003 21.324+0000000012415590 22.324+0000000009121020 31..00+0000000000034332 32..10+0000000000034323 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000465472895 82..00+0000000110527228 83..00+0000000000302954 71....+0000000000000000 
@@ -51,9 +51,9 @@
 *110046+0000000000000042 21.324+0000000011526030 22.324+0000000008909420 31..00+0000000000032271 32..10+0000000000032268 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000682 81..00+0000000465473669 82..00+0000000110532696 83..00+0000000000303036 71....+0000000000000000 
 *110047+0000000000000043 21.324+0000000011346490 22.324+0000000008855450 31..00+0000000000032842 32..10+0000000000032836 87..10+0000000000001300 58..16+0000000000000175 33..10+0000000000000824 81..00+0000000465474578 82..00+0000000110533313 83..00+0000000000303177 71....+0000000000000000 
 *410010+0000000000000040 
-*110004+00000000000GS001 21.324+0000000013831010 22.324+0000000008932340 31..00+0000000000029523 32..10+0000000000029522 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000754 81..00+0000000531242578 82..00+0000000073008189 83..00+0000000000800864 71....+0000000000000000 
-*110005+00000000000GS002 21.324+0000000019023040 22.324+0000000010338410 31..00+0000000000007115 32..10+0000000000006914 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000268 81..00+0000000531221776 82..00+0000000073023505 83..00+0000000000801350 71....+0000000000000000 
-*110006+00000000000GS003 21.324+0000000003614410 22.324+0000000009121020 31..00+0000000000034333 32..10+0000000000034324 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000531243315 82..00+0000000073057988 83..00+0000000000802219 71....+0000000000000000 
+*110004+00000000000GS001 21.324+0000000013831010 22.324+0000000008932340 31..00+0000000000029523 32..10+0000000000029522 87..10+0000000000002500 58..16+0000000000000175 33..10-0000000000000754 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586 71....+0000000000000000 
+*110005+00000000000GS002 21.324+0000000019023040 22.324+0000000010338410 31..00+0000000000007115 32..10+0000000000006914 87..10+0000000000000100 58..16+0000000000000175 33..10-0000000000000268 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107 71....+0000000000000000 
+*110006+00000000000GS003 21.324+0000000003614410 22.324+0000000009121020 31..00+0000000000034333 32..10+0000000000034324 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 71....+0000000000000000 
 *110007+0000000000011111 25.344+0000000008801190 84..40+0000000465444529 85..40+0000000110546554 86..40+0000000000302353 87..10+0000000000000100 88..10+0000000000001510 
 *410000+0000000000000080 
 *110008+00000000000GS003 21.324+0000000012415590 22.324+0000000009121020 31..00+0000000000034332 32..10+0000000000034323 87..10+0000000000000100 58..16+0000000000000175 33..10+0000000000000601 81..00+0000000465472895 82..00+0000000110527228 83..00+0000000000302954 71....+0000000000000000