diff --git a/src/MyApplication/.idea/sonarlint/issuestore/3/0/30a54a60f14d64645eed00c5f82475af0b8df642 b/src/MyApplication/.idea/sonarlint/issuestore/3/0/30a54a60f14d64645eed00c5f82475af0b8df642
index 0f0dbd2..df3bb93 100644
--- a/src/MyApplication/.idea/sonarlint/issuestore/3/0/30a54a60f14d64645eed00c5f82475af0b8df642
+++ b/src/MyApplication/.idea/sonarlint/issuestore/3/0/30a54a60f14d64645eed00c5f82475af0b8df642
@@ -1,27 +1,27 @@
 
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(éóÈàûÿÿÿÿ
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¢ææòýÿÿÿÿ
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(™ÕÃ¼þÿÿÿÿ
 esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ñ¥—²ýÿÿÿÿ
-Ksquid:S2696"6Make the enclosing method "static" or remove this set.(ƒÌï�
 `squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ù¤¾¤
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(Ù÷žñùÿÿÿÿ
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¹ÿÁ�ûÿÿÿÿ
-@squid:S1172"+Remove this unused method parameter "view".(É‚£�
-Ssquid:S1155">Use isEmpty() to check whether the collection is empty or not.(ö‡Òí
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¶¾õÕ
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(³¿á•
-Psquid:S2696"6Make the enclosing method "static" or remove this set.(Ý…ÿÛüÿÿÿÿ
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ŒöÜ‰
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¼õØ€ùÿÿÿÿ
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¾Äºú
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(û�¤™ûÿÿÿÿ
-@squid:S1444",Make this "public static mState" field final(½²»|
-Lsquid:S2589"7Remove this expression which always evaluates to "true"(â¿ß“
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ŒöÜ‰
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(›¢¼Äüÿÿÿÿ
-–squid:S1186"€Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(ò‘�‘
 _squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(À�ÎC
-Bsquid:S2387"."mState" is the name of a field in "Fragment".(½²»|
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¼õØ€ùÿÿÿÿ
+@squid:S1172"+Remove this unused method parameter "view".(É‚£�
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(éóÈàûÿÿÿÿ
+Psquid:S2696"6Make the enclosing method "static" or remove this set.(Ý…ÿÛüÿÿÿÿ
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¾Äºú
+–squid:S1186"€Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(ò‘�‘
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(û�¤™ûÿÿÿÿ
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(›¢¼Äüÿÿÿÿ
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¹ÿÁ�ûÿÿÿÿ
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(Ù÷žñùÿÿÿÿ
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(™ÕÃ¼þÿÿÿÿ
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(³¿á•
+Ssquid:S1155">Use isEmpty() to check whether the collection is empty or not.(ö‡Òí
 Jsquid:S2696"6Make the enclosing method "static" or remove this set.(º’ë1
-}"squid:ClassVariableVisibilityCheck"RMake mState a static final constant or non-public and provide accessors if needed.(½²»|
\ No newline at end of file
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ŒöÜ‰
+@squid:S1444",Make this "public static mState" field final(½²»|
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ŒöÜ‰
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¢ææòýÿÿÿÿ
+}"squid:ClassVariableVisibilityCheck"RMake mState a static final constant or non-public and provide accessors if needed.(½²»|
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¶¾õÕ
+Lsquid:S2589"7Remove this expression which always evaluates to "true"(â¿ß“
+Ksquid:S2696"6Make the enclosing method "static" or remove this set.(ƒÌï�
+Bsquid:S2387"."mState" is the name of a field in "Fragment".(½²»|
\ No newline at end of file
diff --git a/src/MyApplication/.idea/sonarlint/issuestore/6/7/67dcf9378cf673b1d3b665701ca8ab112314a41a b/src/MyApplication/.idea/sonarlint/issuestore/6/7/67dcf9378cf673b1d3b665701ca8ab112314a41a
index 8b96492..b3f730c 100644
--- a/src/MyApplication/.idea/sonarlint/issuestore/6/7/67dcf9378cf673b1d3b665701ca8ab112314a41a
+++ b/src/MyApplication/.idea/sonarlint/issuestore/6/7/67dcf9378cf673b1d3b665701ca8ab112314a41a
@@ -1,18 +1,18 @@
 
 esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(”“É‰úÿÿÿÿ
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¡…•æùÿÿÿÿ
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(�ÀÆ’
 ssquid:S1450"YRemove the "isFirstUse" field and declare it as a local variable in the relevant methods.(ÃÑ��ûÿÿÿÿ
 `squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(�ÀÆ’
-`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ôä¾„
-bsquid:CallToDeprecatedMethod"=Remove this use of "setBackgroundDrawable"; it is deprecated.(”›õV
-_squid:HiddenFieldCheck":Rename "drawer" which hides the field declared at line 41.(ÐÍè¨þÿÿÿÿ
-esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(Û¿’�ýÿÿÿÿ
-_squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(üêÝ/
-Asquid:S1905",Remove this unnecessary cast to "ImageView".(ÆïË”
-_squid:HiddenFieldCheck":Rename "drawer" which hides the field declared at line 41.(ÐÍè¨þÿÿÿÿ
-dsquid:CallToDeprecatedMethod"9Remove this use of "setDrawerListener"; it is deprecated.(ø¶Âßÿÿÿÿÿ
 qsquid:S1450"WRemove the "baseView" field and declare it as a local variable in the relevant methods.(‘‚¼²þÿÿÿÿ
 esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(–“Å�ýÿÿÿÿ
+_squid:HiddenFieldCheck":Rename "drawer" which hides the field declared at line 41.(ÐÍè¨þÿÿÿÿ
+_squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(üêÝ/
+bsquid:CallToDeprecatedMethod"=Remove this use of "setBackgroundDrawable"; it is deprecated.(”›õV
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(�ÀÆ’
+isquid:MaximumInheritanceDepth"=This class has 10 parents which is greater than 5 authorized.(ù ®Íúÿÿÿÿ
 ysquid:S1450"_Remove the "noteBookFragment" field and declare it as a local variable in the relevant methods.(­Óé«ùÿÿÿÿ
-isquid:MaximumInheritanceDepth"=This class has 10 parents which is greater than 5 authorized.(ù ®Íúÿÿÿÿ
\ No newline at end of file
+_squid:HiddenFieldCheck":Rename "drawer" which hides the field declared at line 41.(ÐÍè¨þÿÿÿÿ
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(Û¿’�ýÿÿÿÿ
+dsquid:CallToDeprecatedMethod"9Remove this use of "setDrawerListener"; it is deprecated.(ø¶Âßÿÿÿÿÿ
+Asquid:S1905",Remove this unnecessary cast to "ImageView".(ÆïË”
+`squid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(ôä¾„
+esquid:CommentedOutCodeLine"<This block of commented-out lines of code should be removed.(¡…•æùÿÿÿÿ
\ No newline at end of file
diff --git a/src/MyApplication/app/src/main/res/layout/app_bar_main.xml b/src/MyApplication/app/src/main/res/layout/app_bar_main.xml
index 6c9e9a9..dd27903 100644
--- a/src/MyApplication/app/src/main/res/layout/app_bar_main.xml
+++ b/src/MyApplication/app/src/main/res/layout/app_bar_main.xml
@@ -71,28 +71,7 @@
                 <!--android:layout_height="wrap_content"-->
                 <!--app:srcCompat="@drawable/app_bar_menu"/>-->
 
-            <!--<android.support.design.widget.TabLayout-->
-                <!--android:id="@+id/app_bar_tablayout"-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--app:tabGravity="center"-->
-                <!--app:tabSelectedTextColor="@color/black"-->
-                <!--android:layout_alignParentTop="true"-->
-                <!--android:layout_centerHorizontal="true">-->
 
-                <!--<android.support.design.widget.TabItem-->
-                    <!--android:id="@+id/app_bar_item1"-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:text="æ–‡ç« "/>-->
-
-                <!--<android.support.design.widget.TabItem-->
-                    <!--android:id="@+id/app_bar_item2"-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:text="å›¾ç‰‡"/>-->
-
-            <!--</android.support.design.widget.TabLayout>-->
 
             <!--<ImageButton-->
                 <!--android:id="@+id/app_bar_search"-->
@@ -123,7 +102,34 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_main" />
+    <include
+        android:id="@+id/include"
+        layout="@layout/content_main"/>
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/app_bar_tablayout"
+        android:layout_width="394dp"
+        android:layout_height="45dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_gravity="bottom|right"
+        app:layout_anchor="@+id/include"
+        app:layout_anchorGravity="top|left"
+        app:tabSelectedTextColor="@color/black">
+
+        <android.support.design.widget.TabItem
+            android:id="@+id/app_bar_item1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="æ–‡ç« "/>
+
+        <android.support.design.widget.TabItem
+            android:id="@+id/app_bar_item2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="å›¾ç‰‡"/>
+
+    </android.support.design.widget.TabLayout>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
@@ -136,4 +142,5 @@
         app:rippleColor="@android:color/transparent"
         android:src="@drawable/actionbar_icon_add" />
 
+
 </android.support.design.widget.CoordinatorLayout>
diff --git a/src/MyApplication/app/src/main/res/layout/content_main.xml b/src/MyApplication/app/src/main/res/layout/content_main.xml
index 012eaf6..304d178 100644
--- a/src/MyApplication/app/src/main/res/layout/content_main.xml
+++ b/src/MyApplication/app/src/main/res/layout/content_main.xml
@@ -38,5 +38,7 @@
     <FrameLayout
         android:id="@+id/main_fraglayout"
         android:layout_height="match_parent"
-        android:layout_width="match_parent"/>
+        android:layout_width="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"/>
 </RelativeLayout>
diff --git a/src/MyApplication/app/src/main/res/values/dimens.xml b/src/MyApplication/app/src/main/res/values/dimens.xml
index fee0beb..07ee393 100644
--- a/src/MyApplication/app/src/main/res/values/dimens.xml
+++ b/src/MyApplication/app/src/main/res/values/dimens.xml
@@ -4,7 +4,7 @@
     <dimen name="nav_header_height">200dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">61dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="space_35">35.0dip</dimen>
     <dimen name="base_action_bar_height">48.0dip</dimen>
