diff --git a/Screenshots/upload-screen.png b/Screenshots/upload-screen.png
new file mode 100755
index 0000000..c4dadfc
Binary files /dev/null and b/Screenshots/upload-screen.png differ
diff --git a/app/build.gradle b/app/build.gradle
index 2a41bc3..c1ab0b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,5 +30,4 @@ dependencies {
 
     implementation 'com.android.volley:volley:1.1.0'
     implementation 'com.github.kenglxn.QRGen:android:2.4.0'
-    implementation 'com.kofigyan.stateprogressbar:stateprogressbar:0.0.9'
 }
diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java b/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java
index 5db81c3..0c6607e 100644
--- a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java
+++ b/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java
@@ -36,13 +36,13 @@ public class SyncActivity extends AppCompatActivity {
     }
 
     private void generateMyQR() {
-        ImageView qrImageView = findViewById(R.id.sync_my_qr);
+//        ImageView qrImageView = findViewById(R.id.sync_my_qr);
 
         Bitmap myBitmap = QRCode.from("This is my organisation information!")
                 .withColor(0xFF000000, 0x00000000)
                 .withSize(512,512)
                 .bitmap();
 
-        qrImageView.setImageBitmap(myBitmap);
+//        qrImageView.setImageBitmap(myBitmap);
     }
 }
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000..17aca2a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_sync.xml b/app/src/main/res/layout/activity_sync.xml
index 284dd64..069dd4a 100644
--- a/app/src/main/res/layout/activity_sync.xml
+++ b/app/src/main/res/layout/activity_sync.xml
@@ -63,11 +63,11 @@
             android:background="@color/colorPrimary"
             android:indeterminate="false"
             android:max="100"
+            android:progress="100"
             android:paddingBottom="8dp"
             android:paddingEnd="60dp"
             android:paddingStart="60dp"
             android:paddingTop="8dp"
-            android:progress="2"
             android:progressTint="@color/colorAccent"
             android:visibility="visible" />
     </android.support.design.widget.AppBarLayout>
@@ -85,32 +85,184 @@
         <!--android:orientation="vertical">-->
 
         <!--<FrameLayout-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="match_parent">-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent">-->
 
-            <!--<ImageView-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="match_parent"-->
-                <!--android:adjustViewBounds="true"-->
-                <!--android:cropToPadding="true"-->
-                <!--android:scaleType="centerCrop"-->
-                <!--android:src="@drawable/test_image_low_res" />-->
+        <!--<ImageView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:adjustViewBounds="true"-->
+        <!--android:cropToPadding="true"-->
+        <!--android:scaleType="centerCrop"-->
+        <!--android:src="@drawable/test_image_low_res" />-->
 
-            <!--<ImageView-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="match_parent"-->
-                <!--android:src="@drawable/ic_qr_aim"-->
-                <!--android:tint="@color/colorPrimary" />-->
+        <!--<ImageView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:src="@drawable/ic_qr_aim"-->
+        <!--android:tint="@color/colorPrimary" />-->
 
         <!--</FrameLayout>-->
 
-        <ImageView
-            android:id="@+id/sync_my_qr"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="false"
-            android:cropToPadding="false"
-            android:scaleType="center"/>
+        <!--<ImageView-->
+        <!--android:id="@+id/sync_my_qr"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:adjustViewBounds="false"-->
+        <!--android:cropToPadding="false"-->
+        <!--android:scaleType="center"/>-->
+
+        <android.support.v7.widget.CardView
+            android:layout_margin="16dp"
+            android:id="@+id/cardView_0"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            app:contentPadding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Test connection to server"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:src="@drawable/ic_check"
+                    android:tint="@color/colorPrimary" />
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/cardView_1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="32dp"
+            app:contentPadding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cardView_0">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Add organisation"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:src="@drawable/ic_check"
+                    android:tint="@color/colorPrimary" />
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+            android:layout_margin="16dp"
+            android:id="@+id/cardView_2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="24dp"
+            app:contentPadding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cardView_1">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Add user to organisation"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:src="@drawable/ic_check"
+                    android:tint="@color/colorPrimary" />
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+            android:layout_margin="16dp"
+            android:id="@+id/cardView_3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="24dp"
+            app:contentPadding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cardView_2">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Add sync server"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:src="@drawable/ic_check"
+                    android:tint="@color/colorPrimary" />
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <Button
+            android:id="@+id/button3"
+            style="@style/CustomButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/background_rounded_main"
+            android:backgroundTint="@color/colorPrimary"
+            android:text="finish"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <!--</LinearLayout>-->
     </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b14e75c..78909eb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,6 @@
     </style>
 
     <style name="CustomButton" parent="Widget.AppCompat.Button">
-        <item name="background">@color/colorPrimary</item>
         <item name="android:background">@color/colorPrimary</item>
         <item name="android:textColor">@color/color_text_foreground</item>
     </style>