diff --git a/guide/app_config_ini.tex b/guide/app_config_ini.tex
index f8be3dda1bfb8..187ae21704c10 100644
--- a/guide/app_config_ini.tex
+++ b/guide/app_config_ini.tex
@@ -659,6 +659,8 @@ \subsection{\big[navigation\big]}
                                            To look Northwest and up at $45\degree$, use \emph{-1,-1,1} and so on.\\%\midrule
 auto\_move\_duration            & float  & Duration (seconds) for the program to move to point at an object when the space bar is pressed. 
                                            Typical value: \emph{1.4}\\%\midrule
+return\_home\_duration          & float  & Duration (seconds) of movement of returning to a home location (for a demo). Default value: \emph{0.}\\%\midrule
+return\_fov\_duration           & float  & Duration (seconds) of zooming to an initial field of view value (for a demo). Default value: \emph{1.}\\%\midrule
 mouse\_zoom                     & float  & Sets the mouse zoom amount (mouse-wheel)\\%\midrule
 move\_speed                     & float  & Sets the speed of movement\\%\midrule
 zoom\_speed                     & float  & Sets the zoom speed\\%\midrule
diff --git a/plugins/RemoteControl/webroot/images/icons-active.png b/plugins/RemoteControl/webroot/images/icons-active.png
index 913552d348e41..3a14f9b2d1ad0 100644
Binary files a/plugins/RemoteControl/webroot/images/icons-active.png and b/plugins/RemoteControl/webroot/images/icons-active.png differ
diff --git a/plugins/RemoteControl/webroot/images/icons.png b/plugins/RemoteControl/webroot/images/icons.png
index 7b8765269c8e2..02d1442c4e26a 100644
Binary files a/plugins/RemoteControl/webroot/images/icons.png and b/plugins/RemoteControl/webroot/images/icons.png differ
diff --git a/plugins/RemoteControl/webroot/index.html b/plugins/RemoteControl/webroot/index.html
index db27809ce44e8..2932a54cdd22b 100644
--- a/plugins/RemoteControl/webroot/index.html
+++ b/plugins/RemoteControl/webroot/index.html
@@ -89,8 +89,8 @@ <h1><?= tr("Stellarium remote control")?></h1>
                 <li data-next="actionAdd_Solar_Day" data-prev="actionSubtract_Solar_Day"><?= tr("Solar day")?></li>
                 <li data-next="actionAdd_Solar_Week" data-prev="actionSubtract_Solar_Week"><?= tr("Solar week")?></li>
 
-                <li data-next="actionAdd_Calendar_Year"    data-prev="actionSubtract_Calendar_Year">   <?= tr("Calendar year")?></li>
-                <li data-next="actionAdd_Calendar_Decade"  data-prev="actionSubtract_Calendar_Decade"> <?= tr("10 Calendar years")?></li>
+                <li data-next="actionAdd_Calendar_Year"    data-prev="actionSubtract_Calendar_Year"><?= tr("Calendar year")?></li>
+                <li data-next="actionAdd_Calendar_Decade"  data-prev="actionSubtract_Calendar_Decade"><?= tr("10 Calendar years")?></li>
                 <li data-next="actionAdd_Calendar_Century" data-prev="actionSubtract_Calendar_Century"><?= tr("100 Calendar years")?></li>
 
                 <li data-next="actionAdd_Sidereal_Day" data-prev="actionSubtract_Sidereal_Day"><?= tr("Sidereal day")?></li>
@@ -313,7 +313,7 @@ <h3><input class="stelaction" name="actionShow_Stars" type="checkbox"/><?= tr("S
             <h3><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr("Solar System objects")?></h3>
             <label><input type="checkbox" class="stelaction" name="actionShow_Planets_Hints" /><?= tr("Show planet markers")?></label>
             <label><input type="checkbox" class="stelaction" name="actionShow_Planets_Orbits" /><?= tr("Show planet orbits")?></label>
-			<label><input class="stelproperty" name="SolarSystem.flagPlanetsOrbitsOnly" type="checkbox"/><?= tr("Show planet orbits only")?></label>
+  	    <label><input class="stelproperty" name="SolarSystem.flagPlanetsOrbitsOnly" type="checkbox"/><?= tr("Show planet orbits only")?></label>
             <label><input class="stelproperty" name="SolarSystem.flagIsolatedOrbits" type="checkbox"/><?= tr("Show orbit for selected planet")?></label>
             <label><input class="stelproperty" name="SolarSystem.trailsDisplayed" type="checkbox"/><?= tr("Show planet trails")?></label>
             <label><input class="stelproperty" name="SolarSystem.flagIsolatedTrails" type="checkbox"/><?= tr("Show trail only for selected planet")?></label>
@@ -327,8 +327,17 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr
               <td><label><input class="stelproperty" name="SolarSystem.flagMinorBodyScale" type="checkbox"/><?= tr("Scale minor bodies:")?></label></td><td><input class="spinner stelproperty" name="SolarSystem.minorBodyScale" data-min="1" data-max="1000" data-step="0.5" data-numberformat="n1"/></td>
 			  </tr>
 			  </table>
-              <p><label><input class="stelproperty" name="StelSkyDrawer.flagPlanetMagnitudeLimit" type="checkbox"/><?= tr("Limit magnitude:")?></label><input class="spinner stelproperty" name="StelSkyDrawer.customPlanetMagLimit" data-min="0" data-max="22" data-step="0.1" data-numberformat="n2"/></p>
             </div>
+  	    <div class="flex flex-baseline">
+               <label><input class="stelproperty" name="SolarSystem.flagMarkers" type="checkbox"/><?= tr("Mark minor bodies:")?>
+	          <span class="stelproperty" data-prop="SolarSystem.markerMagThreshold" data-numberformat="n2"/> -- </label>
+		  <div class="slider stelproperty flex-expand" data-prop="SolarSystem.markerMagThreshold" data-min="-5" data-max="37" data-step="0.1" data-numberformat="n2"></div>
+  	    </div>
+  	    <div class="flex flex-baseline">
+               <label><input class="stelproperty" name="StelSkyDrawer.flagPlanetMagnitudeLimit" type="checkbox"/><?= tr("Limit magnitude:")?>
+	          <span class="stelproperty" data-prop="StelSkyDrawer.customPlanetMagLimit" data-numberformat="n2"/> -- </label>
+		  <div class="slider stelproperty flex-expand" data-prop="StelSkyDrawer.customPlanetMagLimit" data-min="0" data-max="22" data-step="0.1" data-numberformat="n2"></div>
+  	    </div>
             <div class="flex flex-baseline">
               <label><input type="checkbox" class="stelaction" name="actionShow_Planets_Labels"/><?= tr("Labels and Markers")?></label><div class="slider stelproperty flex-expand" data-prop="SolarSystem.labelsAmount" data-min="0" data-max="10" data-step="0.1"></div>
             </div>
@@ -348,7 +357,17 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr
             <h3><label><input type="checkbox" class="stelaction valign-middle" name="actionShow_Atmosphere"/><?= tr("Atmosphere")?></label></h3>
             <label><input type="checkbox" class="stelaction" name="actionShow_LightPollutionFromDatabase" /><?= tr("Light pollution data from locations database")?></label>
             <div class="table">
-              <p><label for="atmosphere_bortlescaleindex"><?= tr("Light pollution:")?></label><input id="atmosphere_bortlescaleindex" class="spinner stelproperty" name="StelSkyDrawer.bortleScaleIndex" data-min="1" data-max="9" data-step="1" data-numberformat="n0"/></p>
+              <label><?= tr("Bortle class:")?> 
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(1)" title='<?= tr("excellent dark-sky site")?>'>1</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(2)" title='<?= tr("typical truly dark site")?>'>2</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(3)" title='<?= tr("rural sky")?>'>3</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(4)" title='<?= tr("rural/suburban transition")?>'>4</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(5)" title='<?= tr("suburban sky")?>'>5</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(6)" title='<?= tr("bright suburban sky")?>'>6</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(7)" title='<?= tr("suburban/urban transition")?>'>7</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(8)" title='<?= tr("city sky")?>'>8</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(9)" title='<?= tr("inner-city sky")?>'>9</button>
+              </label>
             </div>
             <div id="vo_refraction" class="innerblock">
               <h3><?= tr("Refraction Settings")?></h3>
@@ -356,9 +375,7 @@ <h3><?= tr("Refraction Settings")?></h3>
                 <p><label for="atmosphere_pressure"><?= tr("Pressure (mbar):")?></label><input id="atmosphere_pressure" class="spinner stelproperty" name="StelSkyDrawer.atmospherePressure" data-min="0" data-max="1500" data-step="1" data-numberformat="n2"/></p>
                 <p><label for="atmosphere_temperature"><?= tr("Temperature (C):")?></label><input id="atmosphere_temperature" class="spinner stelproperty" name="StelSkyDrawer.atmosphereTemperature" data-min="-100" data-max="100" data-step="1" data-numberformat="n1"/></p>
                 <p><label for="atmosphere_extinction"><?= tr("Extinction Coefficient:")?></label><input id="atmosphere_extinction" class="spinner stelproperty" name="StelSkyDrawer.extinctionCoefficient" data-min="0" data-max="3" data-step="0.01" data-numberformat="n2"/></p>
-				<p><label title='<?= tr("Only extinction/refraction, no blue skylight")?>'>
-				               <input type="checkbox" class="stelproperty" name="LandscapeMgr.atmosphereNoScatter"/><?= tr("Suppress scattering")?></label></p>
-
+		<p><label title='<?= tr("Only extinction/refraction, no blue skylight")?>'><input type="checkbox" class="stelproperty" name="LandscapeMgr.atmosphereNoScatter"/><?= tr("Suppress scattering")?></label></p>
               </div>
             </div>
             <div class="innerblock flex flex-baseline">
@@ -373,7 +390,7 @@ <h3><?= tr("Shooting Stars")?></h3>
           </div>
           <div id="vo_markers_boxes" class="smallblock flex">
             <h3><input type="checkbox" class="stelaction" name="actionShow_Gridlines" /><?= tr("Celestial Sphere")?></h3>
-			<div class="inline-block blocklabel">
+		<div class="inline-block blocklabel">
                 <label><input type="checkbox" class="stelaction" name="actionShow_Equatorial_J2000_Grid" /><?= tr("Equatorial grid (J2000)")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Equatorial_Grid" /><?= tr("Equatorial grid (of date)")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Fixed_Equatorial_Grid" /><?= tr("Fixed Equatorial grid")?></label>
@@ -389,9 +406,9 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Gridlines" /><?=
                 <label><input type="checkbox" class="stelaction" name="actionShow_Apex_Points" /><?= tr("Apex points")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Galactic_Center" /><?= tr("Galactic center and anticenter")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Cardinal_Points" /><?= tr("Cardinal points")?>
-				       <input type="checkbox" class="stelaction" name="actionShow_Intercardinal_Points" />8 
-					   <input type="checkbox" class="stelaction" name="actionShow_Secondary_Intercardinal_Points" />16
-					   <input type="checkbox" class="stelaction" name="actionShow_Tertiary_Intercardinal_Points" />32</label>
+		       <input type="checkbox" class="stelaction" name="actionShow_Intercardinal_Points" />8 
+		       <input type="checkbox" class="stelaction" name="actionShow_Secondary_Intercardinal_Points" />16
+		       <input type="checkbox" class="stelaction" name="actionShow_Tertiary_Intercardinal_Points" />32</label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Compass_Marks"/><?= tr("Compass marks")?></label>
             </div>
             <div class="inline-block blocklabel">
@@ -400,7 +417,7 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Gridlines" /><?=
                 <label><input type="checkbox" class="stelaction" name="actionShow_Fixed_Equator_Line" /><?= tr("Fixed Equator")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Ecliptic_J2000_Line" /><?= tr("Ecliptic (J2000)")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Ecliptic_Line" /><?= tr("Ecliptic (of date)")?>
-				       <input type="checkbox" class="stelproperty" name="GridLinesMgr.eclipticDatesLabeled" /><?= tr("with Solar Dates")?></label>
+ 	               <input type="checkbox" class="stelproperty" name="GridLinesMgr.eclipticDatesLabeled" /><?= tr("with Solar Dates")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Horizon_Line" /><?= tr("Horizon")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Galactic_Equator_Line" /><?= tr("Galactic equator")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Supergalactic_Equator_Line" /><?= tr("Supergalactic equator")?></label>
@@ -412,9 +429,9 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Gridlines" /><?=
                 <label title='<?= tr("Show colures (great circles through poles and solstices/equinoxes).")?>'><input type="checkbox" class="stelaction" name="actionShow_Colure_Lines" /><?= tr("Colures")?></label>
                 <label title='<?= tr("Instantaneous circles of earth´s axis on its motion around ecliptical poles. Displayed on Earth only.")?>'>
                        <input type="checkbox" class="stelaction" name="actionShow_Precession_Circles" /><?= tr("Precession circles")?></label>				
-			    <label title='<?= tr("Show Prime (East-West) Vertical.")?>'><input type="checkbox" class="stelaction" name="actionShow_Prime_Vertical_Line" /><?= tr("Prime Vertical")?></label>
+		<label title='<?= tr("Show Prime (East-West) Vertical.")?>'><input type="checkbox" class="stelaction" name="actionShow_Prime_Vertical_Line" /><?= tr("Prime Vertical")?></label>
             </div>
-			<div class="inline-block blocklabel">
+	    <div class="inline-block blocklabel">
                 <label><input type="checkbox" class="stelaction" name="actionShow_Celestial_J2000_Poles" /><?= tr("Celestial poles (J2000)")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Celestial_Poles" /><?= tr("Celestial poles (of date)")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Circumpolar_Circles" /><?= tr("Circumpolar circles")?></label>
@@ -426,22 +443,20 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Gridlines" /><?=
                 <label><input type="checkbox" class="stelaction" name="actionShow_Quadrature_Line" /><?= tr("Quadrature circle")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Antisolar_Point" /><?= tr("Antisolar point")?></label>
 				
-				<label><input type="checkbox" class="stelaction" name="actionShow_Umbra_Circle" /><?= tr("Earth umbra")?>
-				       <input type="checkbox" class="stelaction" name="actionShow_Umbra_Center_Point" /><?= tr("Center")?></label>
+		<label><input type="checkbox" class="stelaction" name="actionShow_Umbra_Circle" /><?= tr("Earth umbra")?>
+		       <input type="checkbox" class="stelaction" name="actionShow_Umbra_Center_Point" /><?= tr("Center")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Penumbra_Circle" /><?= tr("Earth penumbra")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_Invariable_Plane_Line" /><?= tr("Invariable plane of the Solar system")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_FOV_Center_Marker" /><?= tr("Center of FOV")?></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_FOV_Circular_Marker" /><?= tr("Circular FOV")?>
-				       <input id="FOV_circle_diameter" class="spinner stelproperty" name="SpecialMarkersMgr.fovCircularMarkerSize" data-min="0.1" data-max="28" data-step="0.1" data-numberformat="n2"/></label>
+		       <input id="FOV_circle_diameter" class="spinner stelproperty" name="SpecialMarkersMgr.fovCircularMarkerSize" data-min="0.1" data-max="28" data-step="0.1" data-numberformat="n2"/></label>
                 <label><input type="checkbox" class="stelaction" name="actionShow_FOV_Rectangular_Marker" /><?= tr("Rectangular FOV")?>
-				       <input id="FOV_box_width"  class="spinner stelproperty" name="SpecialMarkersMgr.fovRectangularMarkerWidth" data-min="0.1" data-max="180" data-step="0.1" data-numberformat="n2"/>
-				       <input id="FOV_box_height" class="spinner stelproperty" name="SpecialMarkersMgr.fovRectangularMarkerHeight" data-min="0.1" data-max="180" data-step="0.1" data-numberformat="n2"/>
-				       <input id="FOV_box_angle"  class="spinner stelproperty" name="SpecialMarkersMgr.fovRectangularMarkerRotationAngle" data-min="-90" data-max="90" data-step="1" data-numberformat="n1"/></label>
-
+		       <input id="FOV_box_width"  class="spinner stelproperty" name="SpecialMarkersMgr.fovRectangularMarkerWidth" data-min="0.1" data-max="180" data-step="0.1" data-numberformat="n2"/>
+		       <input id="FOV_box_height" class="spinner stelproperty" name="SpecialMarkersMgr.fovRectangularMarkerHeight" data-min="0.1" data-max="180" data-step="0.1" data-numberformat="n2"/>
+		       <input id="FOV_box_angle"  class="spinner stelproperty" name="SpecialMarkersMgr.fovRectangularMarkerRotationAngle" data-min="-90" data-max="90" data-step="1" data-numberformat="n1"/></label>
             </div>
           </div>
-
-		  <div id="vo_archaeolines" class="smallblock flex stelplugin" data-plugin="ArchaeoLines">
+	  <div id="vo_archaeolines" class="smallblock flex stelplugin" data-plugin="ArchaeoLines">
               <h3><label><input type="checkbox" class="stelproperty valign-middle" name="ArchaeoLines.enabled"/><?= tr("ArchaeoLines")?></label></h3>
               <div class="inline-block blocklabel">
                 <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowEquinox"/><?= tr("Equinox")?></label>
@@ -471,13 +486,13 @@ <h3><label><input type="checkbox" class="stelproperty valign-middle" name="Archa
                 <option value="4"><?= tr("Jupiter")?></option>
                 <option value="5"><?= tr("Saturn")?></option>
               </select>
-			  <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowSelectedObject"/><?= tr("Selected Object")?></label>
-			  <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowSelectedObjectAzimuth"/><?= tr("Selected Object Azimuth")?></label>
-			  <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowSelectedObjectHourAngle"/><?= tr("Selected Object Hour Angle")?></label>
-			  <label><br/></label>
-			  <label><div class="slider stelproperty flex-expand" data-prop="ArchaeoLines.lineWidth" data-min="1" data-max="8" data-step="1" data-numberformat="n0"></div></label>
+		  <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowSelectedObject"/><?= tr("Selected Object")?></label>
+		  <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowSelectedObjectAzimuth"/><?= tr("Selected Object Azimuth")?></label>
+		  <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowSelectedObjectHourAngle"/><?= tr("Selected Object Hour Angle")?></label>
+		  <label><br/></label>
+		  <label><div class="slider stelproperty flex-expand" data-prop="ArchaeoLines.lineWidth" data-min="1" data-max="8" data-step="1" data-numberformat="n0"></div></label>
               </div>
-			  <div class="inline-block blocklabel">
+	  <div class="inline-block blocklabel">
                 <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowGeographicLocation1"/><?= tr("Geographic Location 1")?> (<span class="stelproperty" data-prop="ArchaeoLines.geographicLocation1Label"></span>)</label>
                 <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowGeographicLocation2"/><?= tr("Geographic Location 2")?> (<span class="stelproperty" data-prop="ArchaeoLines.geographicLocation2Label"></span>)</label>
                 <label><input type="checkbox" class="stelproperty" name="ArchaeoLines.flagShowCustomAzimuth1"/><?= tr("Custom Azimuth 1")?> (<span class="stelproperty" data-prop="ArchaeoLines.customAzimuth1" data-numberformat="n1"></span>&deg;=<span class="stelproperty" data-prop="ArchaeoLines.customAzimuth1Label"></span>)</label>
@@ -637,15 +652,14 @@ <h3><label><input class="stelaction" type="checkbox" name="actionShow_Nebulas" /
             <label><input class="stelproperty" name="NebulaMgr.flagSurfaceBrightnessUsage" type="checkbox"/><?= tr("Use surface brightness")?></label>
             <label><input class="stelproperty" name="NebulaMgr.flagAdditionalNamesDisplayed" type="checkbox"/><?= tr("Use additional names of DSO")?></label>
             <!--p><label><input class="stelproperty" name="StelSkyDrawer.flagNebulaMagnitudeLimit" type="checkbox"/><?= tr("Limit magnitude:")?></label><input class="spinner stelproperty" name="StelSkyDrawer.customNebulaMagLimit" data-min="3" data-max="21" data-step="0.25" data-numberformat="n2"/></p-->
-			<div class="flex flex-baseline">
+  	    <div class="flex flex-baseline">
                <label><input class="stelproperty" name="StelSkyDrawer.flagNebulaMagnitudeLimit" type="checkbox"/><?= tr("Limit magnitude:")?>
-			          <span class="stelproperty" data-prop="StelSkyDrawer.customNebulaMagLimit" data-numberformat="n2"/> -- </label>
-					  <div class="slider stelproperty flex-expand" data-prop="StelSkyDrawer.customNebulaMagLimit" data-min="3" data-max="21" data-step="0.25" data-numberformat="n2"></div>
-			</div>
-			
+	          <span class="stelproperty" data-prop="StelSkyDrawer.customNebulaMagLimit" data-numberformat="n2"/> -- </label>
+		  <div class="slider stelproperty flex-expand" data-prop="StelSkyDrawer.customNebulaMagLimit" data-min="3" data-max="21" data-step="0.25" data-numberformat="n2"></div>
+  	    </div>
             <p><label><input class="stelproperty" name="NebulaMgr.flagUseSizeLimits" type="checkbox"/><?= tr("Limit angular size (arcmin):")?></label>
-					<input class="spinner stelproperty" name="NebulaMgr.minSizeLimit" data-min="1" data-max="600" data-step="1" data-numberformat="n2"/>
-					<input class="spinner stelproperty" name="NebulaMgr.maxSizeLimit" data-min="1" data-max="1200" data-step="1" data-numberformat="n2"/></p>
+  		      <input class="spinner stelproperty" name="NebulaMgr.minSizeLimit" data-min="1" data-max="600" data-step="1" data-numberformat="n2"/>
+		      <input class="spinner stelproperty" name="NebulaMgr.maxSizeLimit" data-min="1" data-max="1200" data-step="1" data-numberformat="n2"/></p>
           </div>
         </div>
       </div>
@@ -843,6 +857,7 @@ <h3><?= tr("Scene selection")?></h3>
       <li title="<?= tr("Center on selected object")?>"><button class="stelaction icon32 btGotoSelectedObject" name="actionSet_Tracking"></button></li>
       <li title="<?= tr("Night mode")?>"><button class="stelaction icon32 btNightView" name="actionShow_Night_Mode"></button></li>
       <li title="<?= tr("Full-screen mode")?>"><button class="stelaction icon32 btFullScreen" name="actionSet_Full_Screen_Global"></button></li>
+      <li title="<?= tr("Go to home")?>"><button class="stelaction icon32 btGotoHome" name="actionGo_Home_Global"></button></li>
     </ul>
   </div>
   <!-- handled by mainui.js -->
diff --git a/plugins/RemoteControl/webroot/style.css b/plugins/RemoteControl/webroot/style.css
index 828d5f442a024..4e89b0d8237e7 100644
--- a/plugins/RemoteControl/webroot/style.css
+++ b/plugins/RemoteControl/webroot/style.css
@@ -8,7 +8,6 @@
          url('dejavusans-webfont.svg#dejavu_sansbook') format('svg');
     font-weight: normal;
     font-style: normal;
-
 }
 
 @font-face {
@@ -85,7 +84,7 @@ div#srch_tab_object {
     color: rgb(3,3,3);
     background: linear-gradient(rgb(86, 87, 90),rgb(48, 49, 52));
     border-width: 0;
-	border-radius: 0;
+    border-radius: 0;
 }
 
 /* Large vertical spinners */
@@ -576,6 +575,7 @@ button.button32:active {
 .icon32.btConstellationLabels { background-position: -148px 0; }
 .icon32.btConstellationLines { background-position: -185px 0; }
 .icon32.btConstellationBoundaries { background-position: -885px 0; }
+.icon32.btGotoHome { background-position: -922px 0; }
 .icon32.btDSS { background-position: -222px 0; }
 .icon32.btFlipHorizontal { background-position: -259px 0; }
 .icon32.btEquatorialGrid { background-position: -296px 0; }
diff --git a/plugins/RemoteControl/webroot/tablet7in.html b/plugins/RemoteControl/webroot/tablet7in.html
index 495cee6751205..bbfc573487063 100644
--- a/plugins/RemoteControl/webroot/tablet7in.html
+++ b/plugins/RemoteControl/webroot/tablet7in.html
@@ -435,15 +435,17 @@ <h3><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr
             <h3><label><input type="checkbox" class="stelaction valign-middle" name="actionShow_Atmosphere"/><?= tr("Atmosphere")?></label></h3>
             <label><input type="checkbox" class="stelaction" name="actionShow_LightPollutionFromDatabase" /><?= tr("Light pollution data from locations database")?></label>
             <div class="table">
-			
-	         <p><div class="flex flex-baseline">
-			      <label><?= tr("Light pollution:")?></label><span class="stelproperty" data-prop="StelSkyDrawer.bortleScaleIndex"></span>
-			      <div class="slider stelproperty flex-expand" data-prop="StelSkyDrawer.bortleScaleIndex" data-min="1" data-max="9" data-step="1"></div>
-				</div>
-			 </p>
-
-			
-              <!--p><label for="atmosphere_bortlescaleindex"><?= tr("Light pollution:")?></label><input id="atmosphere_bortlescaleindex" class="spinner stelproperty" name="StelSkyDrawer.bortleScaleIndex" data-min="1" data-max="9" data-step="1" data-numberformat="n0" readonly="readonly"/></p-->
+              <label><?= tr("Bortle class:")?> 
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(1)" title='<?= tr("excellent dark-sky site")?>'>1</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(2)" title='<?= tr("typical truly dark site")?>'>2</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(3)" title='<?= tr("rural sky")?>'>3</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(4)" title='<?= tr("rural/suburban transition")?>'>4</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(5)" title='<?= tr("suburban sky")?>'>5</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(6)" title='<?= tr("bright suburban sky")?>'>6</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(7)" title='<?= tr("suburban/urban transition")?>'>7</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(8)" title='<?= tr("city sky")?>'>8</button>
+                 <button type="button" class="stelssc" value="core.setBortleScaleIndex(9)" title='<?= tr("inner-city sky")?>'>9</button>
+              </label>
             </div>
             <div id="vo_refraction" class="innerblock">
               <h3><?= tr("Refraction Settings")?></h3>
@@ -939,6 +941,7 @@ <h3><?= tr("Scene selection")?></h3>
       <li title="<?= tr("Center on selected object")?>"><button class="stelaction icon32 btGotoSelectedObject" name="actionSet_Tracking"></button></li>
       <li title="<?= tr("Night mode")?>"><button class="stelaction icon32 btNightView" name="actionShow_Night_Mode"></button></li>
       <li title="<?= tr("Full-screen mode")?>"><button class="stelaction icon32 btFullScreen" name="actionSet_Full_Screen_Global"></button></li>
+      <li title="<?= tr("Go to home")?>"><button class="stelaction icon32 btGotoHome" name="actionGo_Home_Global"></button></li>
     </ul>
   </div>
   <!-- handled by mainui.js -->
diff --git a/src/core/StelCore.cpp b/src/core/StelCore.cpp
index f214af9e7df42..4e9f18f38b0ef 100644
--- a/src/core/StelCore.cpp
+++ b/src/core/StelCore.cpp
@@ -1130,6 +1130,7 @@ void StelCore::returnToHome()
 	// between planets using SpaceShip and second method give does not exist data
 	StelLocationMgr& locationMgr = StelApp::getInstance().getLocationMgr();
 	StelLocation loc;
+	QSettings* conf = StelApp::getInstance().getSettings();
 	if (defaultLocationID == "auto")
 	{
 		locationMgr.locationFromIP();
@@ -1139,10 +1140,9 @@ void StelCore::returnToHome()
 		loc = locationMgr.locationForString(defaultLocationID);
 
 	if (loc.isValid())
-		moveObserverTo(loc, 0.);
+		moveObserverTo(loc, conf->value("navigation/return_home_duration", 0.).toDouble()); // ability set a duration of movement (for a demo)
 
 	PlanetP p = GETSTELMODULE(SolarSystem)->searchByEnglishName(loc.planetName);
-	QSettings* conf = StelApp::getInstance().getSettings();
 
 	LandscapeMgr* landscapeMgr = GETSTELMODULE(LandscapeMgr);
 	landscapeMgr->setCurrentLandscapeID(landscapeMgr->getDefaultLandscapeID());
@@ -1154,7 +1154,7 @@ void StelCore::returnToHome()
 
 	StelMovementMgr* smmgr = getMovementMgr();
 	smmgr->setViewDirectionJ2000(altAzToJ2000(smmgr->getInitViewingDirection(), StelCore::RefractionOff));
-	smmgr->zoomTo(smmgr->getInitFov(), 1.);
+	smmgr->zoomTo(smmgr->getInitFov(), conf->value("navigation/return_fov_duration", 1.).toDouble()); // ability set a duration of zooming (for a demo)
 }
 
 double StelCore::getJDOfLastJDUpdate() const
diff --git a/src/core/modules/SolarSystem.cpp b/src/core/modules/SolarSystem.cpp
index 83ccdd8178d6b..549abcc3ed6da 100644
--- a/src/core/modules/SolarSystem.cpp
+++ b/src/core/modules/SolarSystem.cpp
@@ -4191,7 +4191,7 @@ void SolarSystem::setExtraThreads(int n)
 
 void SolarSystem::setMarkerMagThreshold(double m)
 {
-	markerMagThreshold=qBound(-2.,m,37.);
+	markerMagThreshold=qBound(-5.,m,37.); // sync with GUI & WUI!
 	StelApp::immediateSave("astro/planet_markers_mag_threshold", markerMagThreshold);
 	emit markerMagThresholdChanged(markerMagThreshold);
 }
diff --git a/src/gui/viewDialog.ui b/src/gui/viewDialog.ui
index c16c19fe2e406..d92715d345662 100644
--- a/src/gui/viewDialog.ui
+++ b/src/gui/viewDialog.ui
@@ -1481,7 +1481,7 @@
                     <double>-5.000000000000000</double>
                    </property>
                    <property name="maximum">
-                    <double>25.000000000000000</double>
+                    <double>37.000000000000000</double>
                    </property>
                    <property name="singleStep">
                     <double>0.100000000000000</double>