diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php
index 92fc474..1ea634d 100644
--- a/ground/views/indexTemplate.php
+++ b/ground/views/indexTemplate.php
@@ -29,94 +29,12 @@
 					<button class="btn btn-default" type="button" id="addPointButton" onclick="activateAddPoint()"><span class="glyphicon glyphicon-plus-sign"></span> Добавить точку</button>
 					<a class="btn btn-default" type="button" href="/index/logout"><span class="glyphicon glyphicon-ban-circle"></span> Выйти</a>
 				<?php else:?>
-					<button class="btn btn-default" type="button" id="loginButton" onclick="$('#loginModal').modal('show');"><span class="glyphicon glyphicon-user"></span> Войти</button>
+					<button class="btn btn-success" type="button" id="loginButton" onclick="$('#loginModal').modal('show');"><span class="glyphicon glyphicon-user"></span> Войти для добавления точки</button>
 				<?php endif;?>
             </td>
         </tr>
     </table>
 </div>
-<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="Вход на сайт" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="myModalLabel">Вход на сайт</h4>
-            </div>
-            <div class="modal-body">
-				<div style="display: inline-block;" id="uLogin" data-ulogin="display=panel;fields=first_name,nickname;providers=vkontakte,twitter,facebook,foursquare,google,yandex,mailru;hidden=other;redirect_uri=http%3A%2F%2F<?= $_SERVER['HTTP_HOST'] ?>%2Findex%2Flogin"></div>
-			</div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="modal fade" id="addPointModal" tabindex="-1" role="dialog" aria-labelledby="Добавление новой точки" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="myModalLabel">Добавление новой точки</h4>
-            </div>
-            <div class="modal-body">
-                <form method="POST" action="/json/addpoint/" id="addPointForm">
-                    <div class="form-group">
-                        <label class="control-label" for="name">Название</label>
-                        <label class="control-label error" for="name">(Слишком короткое название точки)</label>
-                        <input type="text" id="addPointName" name="name" class="form-control" />
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label" for="img">URL изображения</label>
-                        <label class="control-label error" for="img">(Что-то не так с сылкой на изображение)</label>
-                        <input type="text" id="addPointImg" name="img" class="form-control" />
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label" for="description">Описание</label>
-                        <label class="control-label error" for="img">(Слишком короткое описание - минимум 25 символов)</label>
-                        <textarea id="addPointDescription" name="description" class="form-control"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label" for="categoryId">Тип</label>
-                        <select id="addPointCategoryId" name="categoryId" class="form-control">
-                            <?php foreach ($categories as $category): ?>
-                                <option value="<?=$category['id']?>"><?=$category['name']?></option>
-                            <?php endforeach; ?>
-                        </select>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label" for="source">Ссылка на источник</label>
-                        <input type="text" id="addPointSource" name="source" class="form-control" placeholder="http://" />
-                    </div>
-
-                    <input type="hidden" id="addPointLat" name="lat" />
-                    <input type="hidden" id="addPointLng" name="lng" />
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
-                <button type="button" class="btn btn-primary" onclick="addPoint();">Сохранить</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="modal fade" id="categoriesModal" tabindex="-1" role="dialog" aria-labelledby="Список доступных категорий" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="myModalLabel">Список доступных категорий</h4>
-            </div>
-            <div class="modal-body">
-                <?php foreach ($categories as $category): ?>
-                    <img src="<?=$category['icon']?>"> - <?=$category['name']?><br/>
-                <?php endforeach; ?>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
-            </div>
-        </div>
-    </div>
-</div>
+<?= $user ? '' : self::renderPartial('modals/login.php', null, true) ?>
+<?= $user ? self::renderPartial('modals/addPoint.php', null, true) : '' ?>
+<?= self::renderPartial('modals/categories.php', null, true) ?>
diff --git a/ground/views/modals/addPoint.php b/ground/views/modals/addPoint.php
new file mode 100644
index 0000000..6a59024
--- /dev/null
+++ b/ground/views/modals/addPoint.php
@@ -0,0 +1,51 @@
+<div class="modal fade" id="addPointModal" tabindex="-1" role="dialog" aria-labelledby="Добавление новой точки" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">Добавление новой точки</h4>
+            </div>
+            <div class="modal-body">
+                <form method="POST" action="/json/addpoint/" id="addPointForm">
+                    <div class="form-group">
+                        <label class="control-label" for="name">Название</label>
+                        <label class="control-label error" for="name">(Слишком короткое название точки)</label>
+                        <input type="text" id="addPointName" name="name" class="form-control" />
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label" for="img">URL изображения</label>
+                        <label class="control-label error" for="img">(Что-то не так с сылкой на изображение)</label>
+                        <input type="text" id="addPointImg" name="img" class="form-control" />
+                    </div>
+
+                    <div class="form-group">
+                        <label class="control-label" for="description">Описание</label>
+                        <label class="control-label error" for="img">(Слишком короткое описание - минимум 25 символов)</label>
+                        <textarea id="addPointDescription" name="description" class="form-control"></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="control-label" for="categoryId">Тип</label>
+                        <select id="addPointCategoryId" name="categoryId" class="form-control">
+                            <?php foreach ($categories as $category): ?>
+                                <option value="<?=$category['id']?>"><?=$category['name']?></option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="control-label" for="source">Ссылка на источник</label>
+                        <input type="text" id="addPointSource" name="source" class="form-control" placeholder="http://" />
+                    </div>
+
+                    <input type="hidden" id="addPointLat" name="lat" />
+                    <input type="hidden" id="addPointLng" name="lng" />
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
+                <button type="button" class="btn btn-primary" onclick="addPoint();">Сохранить</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/ground/views/modals/categories.php b/ground/views/modals/categories.php
new file mode 100644
index 0000000..803932b
--- /dev/null
+++ b/ground/views/modals/categories.php
@@ -0,0 +1,18 @@
+<div class="modal fade" id="categoriesModal" tabindex="-1" role="dialog" aria-labelledby="Список доступных категорий" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">Список доступных категорий</h4>
+            </div>
+            <div class="modal-body">
+                <?php foreach ($categories as $category): ?>
+                    <img src="<?=$category['icon']?>"> - <?=$category['name']?><br/>
+                <?php endforeach; ?>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ground/views/modals/login.php b/ground/views/modals/login.php
new file mode 100644
index 0000000..a9bfd88
--- /dev/null
+++ b/ground/views/modals/login.php
@@ -0,0 +1,16 @@
+<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="Вход на сайт" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">Вход на сайт</h4>
+            </div>
+            <div class="modal-body">
+				<div style="display: inline-block;" id="uLogin" data-ulogin="display=panel;fields=first_name,nickname;providers=vkontakte,twitter,facebook,foursquare,google,yandex,mailru;hidden=other;redirect_uri=http%3A%2F%2F<?= $_SERVER['HTTP_HOST'] ?>%2Findex%2Flogin"></div>
+			</div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/public/js/main.js b/public/js/main.js
index d7ba916..6df6013 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -96,7 +96,7 @@ function getPoints()
                 myMap.geoObjects.add(constructPoint(data[k]));
             }
 
-            if (getURLParameter('point') !=  null)
+            if (getURLParameter('point') !=  'null')
             {
                 showInfo(getURLParameter('point'));
             }