diff --git a/plugins/UserCountry/templates/_updaterManage.twig b/plugins/UserCountry/templates/_updaterManage.twig
index f094d5ee9f89bf831b6221d1383c85ad40ffbe0c..bffc1731c0ccf187729740c670e1babf5b2a5412 100755
--- a/plugins/UserCountry/templates/_updaterManage.twig
+++ b/plugins/UserCountry/templates/_updaterManage.twig
@@ -17,11 +17,9 @@
 			<td width="150">{{ 'UserCountry_LocationDatabase'|translate }}</td>
 			<td><input type="text" id="geoip-location-db" value="{{ geoIPLocUrl }}"/></td>
 			<td width="164">
-				{% set locationHint %}
-				{{ 'UserCountry_LocationDatabaseHint'|translate }}
-				{% endset %}
-                {% import 'macros.twig' as piwik %}
-				{{ piwik.inlineHelp(locationHint) }}
+				<div class="alert alert-info">
+					{{ 'UserCountry_LocationDatabaseHint'|translate }}
+				</div>
 			</td>
 		</tr>
 		<tr>
@@ -42,18 +40,17 @@
 				<label for="geoip-update-period-week">{{ 'CoreHome_PeriodWeek'|translate }}</label>
 			</td>
 			<td width="164">
-			{% set lastTimeRunNote %}
-				{% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %}
-					{{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }}
-				{% else %}
-					{{ 'UserCountry_UpdaterHasNotBeenRun'|translate }}
-				{% endif %}
-        <br/><br/>
-        <div id="geoip-updater-next-run-time">
-        {% include "@UserCountry/_updaterNextRunTime.twig" %}
-        </div>
-			{% endset %}
-			{{ piwik.inlineHelp(lastTimeRunNote) }}
+				<div class="alert alert-info">
+					{% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %}
+						{{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }}
+					{% else %}
+						{{ 'UserCountry_UpdaterHasNotBeenRun'|translate }}
+					{% endif %}
+					<br/><br/>
+					<div id="geoip-updater-next-run-time">
+						{% include "@UserCountry/_updaterNextRunTime.twig" %}
+					</div>
+				</div>
 			</td>
 		</tr>
 	</table>
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 587abe25bd6bb3dcb2bd1cece6b62a58a8f23f40..fe729a449735c439441ee35ede494eb3d4d41763 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -60,36 +60,32 @@
             </td>
             <td width="164">
                 {% if provider.status == 1 %}
-                    {% set currentLocation %}
+                    <div class="alert alert-info">
                         {% if thisIP != '127.0.0.1' %}
                             {{ 'UserCountry_CurrentLocationIntro'|translate }}:
-                            <div style="text-align:left;">
+                            <div>
                                 <br/>
                                 <span class="loadingPiwik" style="display:none;position:absolute;">
                                     <img src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span>
-                                <span class="location"><strong><em>{{ provider.location|raw }}</em></strong></span>
+                                <span class="location"><strong>{{ provider.location|raw }}</strong></span>
                             </div>
-                            <div style="text-align:right;">
+                            <div class="text-right">
                                 <a href="#" class="refresh-loc" data-impl-id="{{ id }}"><em>{{ 'General_Refresh'|translate }}</em></a>
                             </div>
                         {% else %}
                             {{ 'UserCountry_CannotLocalizeLocalIP'|translate(thisIP) }}
                         {% endif %}
-                    {% endset %}
-                    {{ piwik.inlineHelp(currentLocation) }}
+                    </div>
                 {% endif %}
                 {% if provider.statusMessage is defined and provider.statusMessage %}
-                    {% set brokenReason %}
-                        {% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</em></strong> {% endif %}{{ provider.statusMessage|raw }}
-                    {% endset %}
-                    {{ piwik.inlineHelp(brokenReason) }}
+                    <div class="alert alert-info">
+                        {% if provider.status == 2 %}<strong>{{ 'General_Error'|translate }}:</strong> {% endif %}{{ provider.statusMessage|raw }}
+                    </div>
                 {% endif %}
                 {% if provider.extra_message is defined and provider.extra_message %}
-                    {% set extraMessage %}
+                    <div class="alert alert-info">
                         {{ provider.extra_message|raw }}
-                    {% endset %}
-                    <br/>
-                    {{ piwik.inlineHelp(extraMessage) }}
+                    </div>
                 {% endif %}
             </td>
             {% endfor %}