diff --git a/server/template/calendar.html b/server/template/calendar.html
index b9c91dc..7d919c8 100644
--- a/server/template/calendar.html
+++ b/server/template/calendar.html
@@ -2,20 +2,25 @@
 {% block body%}
 
 <div class="container">
-    <div style="width: 15rem; margin: 1rem">Calendar</div>
-    <div style="width: 10rem; margin: 1rem; padding-right: 5rem">Show on device</div>
-    <div style="width: 2rem; margin: 1rem">Color</div>
+    <div style="width: 4rem;margin:1rem;"></div>
+    <div style="width: 15rem; margin: 1rem; font-weight: bold">Calendar</div>
+    <div style="width: 10rem; margin: 1rem; padding-right: 5rem;font-weight: bold">Show on device</div>
+    <div style="width: 2rem; margin: 1rem;font-weight: bold">Color</div>
 </div>
 
     {% for item in calendars %}
     <div class="container">
         <!--action button-->
+        {% if "ical" == item.calType %} 
         <div style="width: 4rem; margin: 1rem;">
             <form action="" method="post">
                 <input type="hidden" name="calendar" value={{ item.calendarId }}>
                 <input type="submit" name="submit" value="Remove">
             </form> 
         </div>
+        {% else %}
+        <div style="width: 4rem; margin: 1rem;"></div>
+        {% endif %}
         <!--Name-->
         <div style="width: 15rem; margin: 1rem;">{{ item.name }}</div>
 
diff --git a/server/template/startpage.html b/server/template/startpage.html
index 9db2f57..c3cf2c4 100644
--- a/server/template/startpage.html
+++ b/server/template/startpage.html
@@ -12,13 +12,15 @@
 <div class="grayblock horizontal">
     <div class="content padded">
         <div style='margin: 1rem'>
-            Connect your <img src='/static/res/googlelogo.png' style='height: 2.2rem; vertical-align:middle; padding-Bottom: 0.1rem'/> Calendar...
+            <!--Connect your <img src='/static/res/googlelogo.png' style='height: 3.2rem; vertical-align:middle; padding-Bottom: 0.1rem'/> Calendar...-->
+            Connect your Calendar..
         </div>
         <img class="image" src='/static/res/calendar.svg'/>
     </div>
     <div class="content padded">
         <div style='margin: 1rem'>
-            ...with your <img src='/static/res/tizenlogo.png' style='height: 2rem; vertical-align:middle; padding-Bottom:0.3rem;'/> Watchface
+            <!--...with your <img src='/static/res/tizenlogo.png' style='height: 2rem; vertical-align:middle; padding-Bottom:0.3rem;'/> Watchface-->
+            ..with your Tizen Watchface
         </div>
         <img class="image" src='/static/res/watchface.svg'/>
     </div>