diff --git a/theme/boost/templates/core/filemanager_selectlayout.mustache b/theme/boost/templates/core/filemanager_selectlayout.mustache
index 31b251db316..03e89722c37 100644
--- a/theme/boost/templates/core/filemanager_selectlayout.mustache
+++ b/theme/boost/templates/core/filemanager_selectlayout.mustache
@@ -3,38 +3,48 @@
         <span class="sr-only">{{#str}}loadinghelp{{/str}}</span>
         {{#pix}}i/loading_small{{/pix}}
     </div>
-    <form class="form clearfix">
-        <div class="fp-forminset">
-                <div class="fp-linktype-2 form-group">
-                    <label class="form-control-label control-radio">{{#str}}makefileinternal, repository{{/str}}</label>
-                    <input class="form-control" type="radio"/>
+    <div class="container">
+        <form>
+            <fieldset class="form-group row">
+                <div class="form-check fp-linktype-2">
+                    <label class="form-check-label">
+                        <input class="form-check-input" type="radio">
+                        {{#str}}makefileinternal, repository{{/str}}
+                    </label>
                 </div>
-                <div class="fp-linktype-1 form-group">
-                    <label class="form-control-label control-radio">{{#str}}makefilelink, repository{{/str}}</label>
-                    <input class="form-control" type="radio"/>
+                <div class="form-check fp-linktype-1">
+                    <label class="form-check-label">
+                        <input class="form-check-input" type="radio">
+                        {{#str}}makefilelink, repository{{/str}}
+                    </label>
                 </div>
-                <div class="fp-linktype-4 form-group">
-                    <label class="form-control-label control-radio">{{#str}}makefilereference, repository{{/str}}</label>
-                    <input class="form-control" type="radio"/>
+                <div class="form-check fp-linktype-4">
+                    <label class="form-check-label">
+                        <input class="form-check-input" type="radio">
+                        {{#str}}makefilereference, repository{{/str}}
+                    </label>
                 </div>
-                <div class="fp-saveas form-group">
-                    <label class="form-control-label">{{#str}}saveas, repository{{/str}}</label>
-                    <input class="form-control" type="text"/>
+            </fieldset>
+            <div class="fp-saveas form-group row">
+                <label class="col-form-label">{{#str}}saveas, repository{{/str}}</label>
+                <input class="form-control" type="text">
+            </div>
+            <div class="fp-setauthor form-group row">
+                <label class="col-form-label">{{#str}}author, repository{{/str}}</label>
+                <input class="form-control" type="text">
+            </div>
+            <div class="fp-setlicense form-group row">
+                <label class="col-form-label">{{#str}}chooselicense, repository{{/str}}</label>
+                <select class="form-control"></select>
+            </div>
+            <div class="form-group row">
+                <div class="fp-select-buttons">
+                    <button class="fp-select-confirm btn-primary btn">{{#str}}getfile, repository{{/str}}</button>
+                    <button class="fp-select-cancel btn-secondary btn">{{#str}}cancel{{/str}}</button>
                 </div>
-                <div class="fp-setauthor form-group">
-                    <label class="form-control-label">{{#str}}author, repository{{/str}}</label>
-                    <input class="form-control" type="text"/>
-                </div>
-                <div class="fp-setlicense form-group">
-                    <label class="form-control-label">{{#str}}chooselicense, repository{{/str}}</label>
-                    <select class="form-control"></select>
-                </div>
-        </div>
-       <div class="fp-select-buttons">
-            <button class="fp-select-confirm btn-primary btn">{{#str}}getfile, repository{{/str}}</button>
-            <button class="fp-select-cancel btn-secondary btn">{{#str}}cancel{{/str}}</button>
-        </div>
-    </form>
+            </div>
+        </form>
+    </div>
     <div class="fp-info clearfix">
         <hr>
         <p class="fp-thumbnail"></p>
@@ -44,7 +54,7 @@
             <div class="fp-size">{{#str}}size, repository{{/str}}<span class="fp-value"></span></div>
             <div class="fp-license">{{#str}}license, repository{{/str}}<span class="fp-value"></span></div>
             <div class="fp-author">{{#str}}author, repository{{/str}}<span class="fp-value"></span></div>
-            <div class="fp-dimensions">{{#str}}dimensions, repository{{/str}}<span class="fp-value"></span></div>
+            <div class="fp-dimensions">{{#str}}dimensions, repository{{/str}}<span class="fp-value" dir="ltr"></span></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>