diff --git a/README.md b/README.md
index a7fce39..7abda42 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Stfalcon Fixturer
 
-Utility for developers and QAs what helps minimize time wasting on writing the same data for testing over and over again. 
+A Utility for developers and QAs which helps minimize time wasting on writing the same data for testing over and over again.
 You can write fixture in XML one time and use it for build testing. The library can autofill EditText with your fixture data.
 
 ### Who we are
-Need iOS and Android apps, MVP development or prototyping? Contact us via info@stfalcon.com. We develop software since 2009, and we're known experts in this field. Check out our [portfolio](https://stfalcon.com/en/portfolio) and see more libraries from [stfalcon-studio](https://stfalcon-studio.github.io/).
+Need iOS and Android apps, MVP development or prototyping? Contact us via info@stfalcon.com. We develop software since 2009, and we're known experts in this field. Check out our [portfolio](https://stfalcon.com/en/portfolio) and see more libraries from [stfalcon-studio](https://stfalcon.com/en/opensource).
 
 ### Download
 
@@ -15,8 +15,8 @@ compile 'com.github.stfalcon:stfalcon-fixturer:0.1.0'
 
 ### Usage
 
-Create xml file in raw directory of app resources. 
-Example: 
+Create xml file in raw directory of app resources.
+Example:
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <fixtures>
@@ -42,7 +42,7 @@ Example:
     </fixture>
 </fixtures>
 ```
-All `fixture` require `tag` attribute. This tag will be used for binding input fields to fixture. 
+All `fixture` require `tag` attribute. This tag will be used for binding input fields to fixture.
 Also you can put some fixtures in groups. For example `email` and `password` can be marked as group `account`. This two fixtures must have the same item count. And in this case where we will select one fixture from group, it will automatically put data to all bound EditTexts to the same grouped fixtures.
 
 To initialize library you have to add this line to your Application `onCreate` method:  
@@ -55,12 +55,13 @@ class SampleApplication : Application() {
     }
 }
 ```
-First parameter it's your Application context. 
+First parameter it's your Application context.
 Second - resource ID of you fixtures XML file.
-The default behaviour is Fixturer works only for debug builds. But if you want to change this behaviour you can pass Boolean flag as third parameter.
+The default behavior is Fixturer works only for debug builds. But if you want to change this behavior you can pass Boolean flag as third parameter.
 
 After that you can bind your EditTexts to the fixtures in your activity(fragment) classes.
-Kotlin: 
+
+Kotlin:
 ```kotlin
 loginEmailEt.setFixtureTag("email")
 ```
@@ -72,11 +73,13 @@ Where `loginEmailEt` is EditText and "email" is tag of the fixture.
 
 Run your application and look on magic :) You can call fixtures dialog by triple tap on bound to fixture EditText.
 
-![alt tag](https://i.imgur.com/KoeGW7E.gif)
+![](https://i.imgur.com/zrdQYM2.gif)
+
+![](https://i.imgur.com/cl6FDA6.gif)
 
 Take a look at the [sample project](sample) for more information
 
-### License 
+### License
 
 ```
 Copyright 2018 stfalcon.com
@@ -94,4 +97,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ```
 
-[sample]: <https://github.com/stfalcon-studio/StfalconFixturer-android/tree/master/sample>
\ No newline at end of file
+[sample]: <https://github.com/stfalcon-studio/StfalconFixturer-android/tree/master/sample>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 296f4de..5482bfe 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.stfalcon.stfalconfixturer.sample">
+    package="com.stfalcon.stfalconfixturer.sample">
 
     <application
-            android:name="com.stfalcon.stfalconfixturer.sample.SampleApplication"
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme">
-        <activity android:name="com.stfalcon.stfalconfixturer.sample.LoginActivity">
+        android:name="com.stfalcon.stfalconfixturer.sample.SampleApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="com.stfalcon.stfalconfixturer.sample.LoginActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.stfalcon.stfalconfixturer.sample.InfoActivity">
-        </activity>
+        <activity
+            android:name="com.stfalcon.stfalconfixturer.sample.InfoActivity"
+            android:screenOrientation="portrait"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/sample/src/main/res/drawable/btn_rounded.xml b/sample/src/main/res/drawable/btn_rounded.xml
new file mode 100644
index 0000000..c483712
--- /dev/null
+++ b/sample/src/main/res/drawable/btn_rounded.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/cornflower_blue" />
+    <corners android:radius="12dp" />
+
+    <gradient
+        android:angle="90"
+        android:endColor="@color/soft_blue"
+        android:startColor="@color/cornflower_blue_two"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/sample/src/main/res/drawable/circle.xml b/sample/src/main/res/drawable/circle.xml
new file mode 100644
index 0000000..a8c36c0
--- /dev/null
+++ b/sample/src/main/res/drawable/circle.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2018. Stepan Tanasiychuk
+  ~
+  ~     This file is part of $filename is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Found ation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <gradient
+        android:angle="90"
+        android:endColor="@color/soft_blue_dark"
+        android:startColor="@color/soft_blue"
+        android:type="linear" />
+    <size
+        android:width="300dp"
+        android:height="300dp" />
+</shape>
\ No newline at end of file
diff --git a/sample/src/main/res/drawable/circles.xml b/sample/src/main/res/drawable/circles.xml
new file mode 100644
index 0000000..2d02954
--- /dev/null
+++ b/sample/src/main/res/drawable/circles.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2018. Stepan Tanasiychuk
+  ~
+  ~     This file is part of $filename is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Found ation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Larger blue circle in back -->
+    <item>
+        <shape android:shape="oval">
+            <gradient
+                android:angle="90"
+                android:endColor="@color/soft_blue_dark"
+                android:startColor="@color/soft_blue"
+                android:type="linear" />
+            <size
+                android:width="300dp"
+                android:height="300dp"/>
+        </shape>
+    </item>
+    <!-- Smaller red circle in front -->
+    <item>
+        <shape android:shape="oval">
+            <!-- transparent stroke = larger_circle_size - smaller_circle_size -->
+            <stroke android:color="@android:color/transparent"
+                android:width="100dp"/>
+            <solid android:color="@color/white"/>
+            <size
+                android:width="200dp"
+                android:height="200dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_info.xml b/sample/src/main/res/layout/activity_info.xml
index 4da6d0d..f385b37 100644
--- a/sample/src/main/res/layout/activity_info.xml
+++ b/sample/src/main/res/layout/activity_info.xml
@@ -1,38 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".InfoActivity">
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="16dp"
-        tools:context=".InfoActivity">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-    <android.support.design.widget.TextInputLayout
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/name">
+            android:layout_height="200dp"
+            android:layout_margin="16dp">
 
-        <EditText
-                android:id="@+id/secondNameEt"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-        />
+                android:layout_height="match_parent"
+                android:layout_margin="16dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/name">
+
+                    <EditText
+                        android:id="@+id/secondNameEt"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/address">
+
+                    <EditText
+                        android:id="@+id/secondAddressEt"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-    </android.support.design.widget.TextInputLayout>
+                </android.support.design.widget.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <!--For demo-->
+
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/address">
+            android:layout_height="200dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp" />
 
-        <EditText
-                android:id="@+id/secondAddressEt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-        />
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp" />
 
-    </android.support.design.widget.TextInputLayout>
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp" />
 
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_login.xml b/sample/src/main/res/layout/activity_login.xml
index 0050270..14cbb70 100644
--- a/sample/src/main/res/layout/activity_login.xml
+++ b/sample/src/main/res/layout/activity_login.xml
@@ -1,30 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical"
+    tools:context=".LoginActivity">
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/loginContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="16dp"
-        tools:context=".LoginActivity">
+        android:layout_height="280dp"
+        android:layout_margin="36dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <EditText
-            android:id="@+id/loginEmailEt"
+        <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/email"/>
+            android:layout_height="match_parent"
+            android:padding="16dp">
 
-    <EditText
-            android:id="@+id/loginPasswordEt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/password"/>
+            <TextView
+                android:id="@+id/loginTitle"
+                style="@style/HeaderText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="16dp"
+                android:text="@string/log_in"
+                android:textColor="@color/soft_blue"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/loginEmailIl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/email"
+                app:hintTextAppearance="@style/MyHintText"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginTitle">
+
+                <EditText
+                    android:id="@+id/loginEmailEt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:theme="@style/MyEditText" />
+
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/loginPasswordIl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/password"
+                app:hintTextAppearance="@style/MyHintText"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginEmailIl"
+                app:passwordToggleEnabled="true">
+
+                <EditText
+                    android:id="@+id/loginPasswordEt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:theme="@style/MyEditText"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/loginEmailEt" />
+
+            </android.support.design.widget.TextInputLayout>
+
+            <Button
+                android:id="@+id/loginBtn"
+                android:layout_width="wrap_content"
+                android:layout_height="36dp"
+                android:layout_margin="8dp"
+                android:background="@drawable/btn_rounded"
+                android:text="@string/log_in"
+                android:textColor="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginPasswordIl" />
+
+            <TextView
+                android:id="@+id/loginSignUp"
+                style="@style/MessageText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/sign_up"
+                android:textColor="@color/soft_blue_dark"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+        </android.support.constraint.ConstraintLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <!--Decor-->
+
+    <View
+        android:id="@+id/circle4"
+        android:layout_width="400dp"
+        android:layout_height="400dp"
+        android:layout_marginTop="100dp"
+        android:layout_marginRight="100dp"
+        android:background="@drawable/circle"
+        app:layout_constraintBottom_toTopOf="@+id/circle3"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <View
+        android:id="@+id/circle3"
+        android:layout_width="400dp"
+        android:layout_height="400dp"
+        android:layout_marginLeft="150dp"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/circle"
+        app:layout_constraintLeft_toLeftOf="@+id/loginContainer"
+        app:layout_constraintTop_toTopOf="@+id/loginContainer" />
+
+    <View
+        android:id="@+id/circle2"
+        android:layout_width="350dp"
+        android:layout_height="350dp"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/circles"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-            android:id="@+id/loginBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Login"
-            />
+    <View
+        android:id="@+id/circle1"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:background="@drawable/circles"
+        app:layout_constraintBottom_toTopOf="@+id/circle3"
+        app:layout_constraintRight_toRightOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
index 69b2233..79c487e 100644
--- a/sample/src/main/res/values/colors.xml
+++ b/sample/src/main/res/values/colors.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="dark_grey">#282a2b</color>
+    <color name="warm_grey">#7f7f7f</color>
+    <color name="dark_mint">#51c05c</color>
+    <color name="soft_blue">#6274e2</color>
+    <color name="soft_blue_dark">#28387e</color>
+    <color name="cornflower_blue">#5c6ede</color>
+    <color name="white">#ffffff</color>
+    <color name="black_dark">#333333</color>
+    <color name="white_two">#efefef</color>
+    <color name="cornflower_blue_two">#4f62d7</color>
+    <color name="white_three">#ebebeb</color>
+    <color name="warm_grey_two">#9c9c9c</color>
+    <color name="dark_grey_two">#191a1b</color>
+    <color name="warm_grey_three">#8b8b8b</color>
+    <color name="warm_grey_four">#979797</color>
 </resources>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 318dce4..ebd43c1 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -4,4 +4,6 @@
     <string name="password">Password</string>
     <string name="name">Name</string>
     <string name="address">Address</string>
+    <string name="log_in">Log In</string>
+    <string name="sign_up">Don`t have an account? SIGN UP</string>
 </resources>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 5885930..af5bcef 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -1,11 +1,38 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/soft_blue</item>
+        <item name="colorPrimaryDark">@color/soft_blue_dark</item>
+        <item name="colorAccent">@color/cornflower_blue</item>
+    </style>
+
+
+    <!--Floating label text style-->
+    <style name="MyHintText" parent="TextAppearance.AppCompat.Small">
+        <item name="android:textColor">@color/dark_grey_two</item>
+    </style>
+
+    <!--Input field style-->
+    <style name="MyEditText" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">@color/dark_grey_two</item>
+        <item name="colorControlActivated">@color/dark_mint</item>
+    </style>
+
+    <!-- Text styles -->
+
+    <style name="HeaderText">
+        <item name="android:textSize">18sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+
+    <style name="MessageText">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:lineSpacingExtra">8sp</item>
     </style>
 
 </resources>