diff --git a/libraries/AP_OSD/AP_OSD_Screen.cpp b/libraries/AP_OSD/AP_OSD_Screen.cpp
index e206e87f0d..936ede0cf9 100644
--- a/libraries/AP_OSD/AP_OSD_Screen.cpp
+++ b/libraries/AP_OSD/AP_OSD_Screen.cpp
@@ -60,158 +60,615 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info[] = {
     // @User: Standard
     AP_GROUPINFO("CHAN_MAX", 3, AP_OSD_Screen, channel_max, 2100),
 
-    // @Group: ALTITUDE
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: ALTITUDE_EN
+    // @DisplayName: ALTITUDE_EN
+    // @Description: Enables display of altitude AGL
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: ALTITUDE_X
+    // @DisplayName: ALTITUDE_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: ALTITUDE_Y
+    // @DisplayName: ALTITUDE_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(altitude, "ALTITUDE", 4, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: BATVOLT
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BATVOLT_EN
+    // @DisplayName: BATVOLT_EN
+    // @Description: Displays main battery voltage
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BATVOLT_X
+    // @DisplayName: BATVOLT_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BATVOLT_Y
+    // @DisplayName: BATVOLT_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(bat_volt, "BAT_VOLT", 5, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: RSSI
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: RSSI_EN
+    // @DisplayName: RSSI_EN
+    // @Description: Displays RC signal strength
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: RSSI_X
+    // @DisplayName: RSSI_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: RSSI_Y
+    // @DisplayName: RSSI_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(rssi, "RSSI", 6, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: CURRENT
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: CURRENT_EN
+    // @DisplayName: CURRENT_EN
+    // @Description: Displays main battery current
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: CURRENT_X
+    // @DisplayName: CURRENT_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: CURRENT_Y
+    // @DisplayName: CURRENT_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(current, "CURRENT", 7, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: BATUSED
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BATUSED_EN
+    // @DisplayName: BATUSED_EN
+    // @Description: Displays main battery mah consumed
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BATUSED_X
+    // @DisplayName: BATUSED_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BATUSED_Y
+    // @DisplayName: BATUSED_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(batused, "BATUSED", 8, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: SATS
-    // @Path: AP_OSD_Setting.cpp
+    // @DisplayName: SATS_EN
+    // @Description: Displays number of acquired sattelites
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: SATS_X
+    // @DisplayName: SATS_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: SATS_Y
+    // @DisplayName: SATS_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(sats, "SATS", 9, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: FLTMODE
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: FLTMODE_EN
+    // @DisplayName: FLTMODE_EN
+    // @Description: Displays flight mode
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: FLTMODE_X
+    // @DisplayName: FLTMODE_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: FLTMODE_Y
+    // @DisplayName: FLTMODE_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(fltmode, "FLTMODE", 10, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: MESSAGE
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: MESSAGE_EN
+    // @DisplayName: MESSAGE_EN
+    // @Description: Displays Mavlink messages
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: MESSAGE_X
+    // @DisplayName: MESSAGE_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: MESSAGE_Y
+    // @DisplayName: MESSAGE_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(message, "MESSAGE", 11, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: GSPEED
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: GSPEED_EN
+    // @DisplayName: GSPEED_EN
+    // @Description: Displays GPS ground speed
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: GSPEED_X
+    // @DisplayName: GSPEED_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: GSPEED_Y
+    // @DisplayName: GSPEED_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(gspeed, "GSPEED", 12, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: HORIZON
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: HORIZON_EN
+    // @DisplayName: HORIZON_EN
+    // @Description: Displays artificial horizon
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: HORIZON_X
+    // @DisplayName: HORIZON_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: HORIZON_Y
+    // @DisplayName: HORIZON_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(horizon, "HORIZON", 13, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: HOME
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: HOME_EN
+    // @DisplayName: HOME_EN
+    // @Description: Displays distance and relative direction to HOME
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: HOME_X
+    // @DisplayName: HOME_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: HOME_Y
+    // @DisplayName: HOME_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(home, "HOME", 14, AP_OSD_Screen, AP_OSD_Setting),
 
-    //@Group: HEADING
-    //@Path: AP_OSD_Setting.cpp
+    // @Param: HEADING_EN
+    // @DisplayName: HEADING_EN
+    // @Description: Displays heading
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: HEADING_X
+    // @DisplayName: HEADING_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: HEADING_Y
+    // @DisplayName: HEADING_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(heading, "HEADING", 15, AP_OSD_Screen, AP_OSD_Setting),
 
-    //@Group: THROTTLE
-    //@Path: AP_OSD_Setting.cpp
+    // @Param: THROTTLE_EN
+    // @DisplayName: THROTTLE_EN
+    // @Description: Displays actual throttle percentage being sent to motor(s)
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: THROTTLE_X
+    // @DisplayName: THROTTLE_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: THROTTLE_Y
+    // @DisplayName: THROTTLE_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(throttle, "THROTTLE", 16, AP_OSD_Screen, AP_OSD_Setting),
 
-    //@Group: COMPASS
-    //@Path: AP_OSD_Setting.cpp
+    // @Param: COMPASS_EN
+    // @DisplayName: COMPASS_EN
+    // @Description: Enables display of compass rose
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: COMPASS_X
+    // @DisplayName: COMPASS_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: COMPASS_Y
+    // @DisplayName: COMPASS_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(compass, "COMPASS", 17, AP_OSD_Screen, AP_OSD_Setting),
 
-    //@Group: WIND
-    //@Path: AP_OSD_Setting.cpp
+    // @Param: WIND_EN
+    // @DisplayName: WIND_EN
+    // @Description: Displays wind speed and relative direction
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: WIND_X
+    // @DisplayName: WIND_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: WIND_Y
+    // @DisplayName: WIND_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(wind, "WIND", 18, AP_OSD_Screen, AP_OSD_Setting),
 
-    //@Group: ASPEED
-    //@Path: AP_OSD_Setting.cpp
+
+    // @Param: ASPEED_EN
+    // @DisplayName: ASPEED_EN
+    // @Description: Displays airspeed value being used by TECS (fused value)
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: ASPEED_X
+    // @DisplayName: ASPEED_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: ASPEED_Y
+    // @DisplayName: ASPEED_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(aspeed, "ASPEED", 19, AP_OSD_Screen, AP_OSD_Setting),
 
-    //@Group: VSPEED
-    //@Path: AP_OSD_Setting.cpp
+    // @Param: VSPEED_EN
+    // @DisplayName: VSPEED_EN
+    // @Description: Displays climb rate
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: VSPEED_X
+    // @DisplayName: VSPEED_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: VSPEED_Y
+    // @DisplayName: VSPEED_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(vspeed, "VSPEED", 20, AP_OSD_Screen, AP_OSD_Setting),
 
 #ifdef HAVE_AP_BLHELI_SUPPORT
-    // @Group: BLHTEMP
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BLHTEMP_EN
+    // @DisplayName: BLHTEMP_EN
+    // @Description: Displays first esc's temp
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BLHTEMP_X
+    // @DisplayName: BLHTEMP_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BLHTEMP_Y
+    // @DisplayName: BLHTEMP_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(blh_temp, "BLHTEMP", 21, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: BLHRPM
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BLHRPM_EN
+    // @DisplayName: BLHRPM_EN
+    // @Description: Displays first esc's rpm
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BLHRPM_X
+    // @DisplayName: BLHRPM_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BLHRPM_Y
+    // @DisplayName: BLHRPM_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(blh_rpm, "BLHRPM", 22, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: BLHAMPS
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BLHAMPS_EN
+    // @DisplayName: BLHAMPS_EN
+    // @Description: Displays first esc's current
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BLHAMPS_X
+    // @DisplayName: BLHAMPS_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BLHAMPS_Y
+    // @DisplayName: BLHAMPS_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(blh_amps, "BLHAMPS", 23, AP_OSD_Screen, AP_OSD_Setting),
 #endif
 
-    // @Group: GPSLAT
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: GPSLAT_EN
+    // @DisplayName: GPSLAT_EN
+    // @Description: Displays GPS latitude
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: GPSLAT_X
+    // @DisplayName: GPSLAT_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: GPSLAT_Y
+    // @DisplayName: GPSLAT_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(gps_latitude, "GPSLAT", 24, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: GPSLONG
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: GPSLONG_EN
+    // @DisplayName: GPSLONG_EN
+    // @Description: Displays GPS longitude
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: GPSLONG_X
+    // @DisplayName: GPSLONG_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: GPSLONG_Y
+    // @DisplayName: GPSLONG_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(gps_longitude, "GPSLONG", 25, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: ROLL
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: ROLL_EN
+    // @DisplayName: ROLL_EN
+    // @Description: Displays degrees of roll from level
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: ROLL_X
+    // @DisplayName: ROLL_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: ROLL_Y
+    // @DisplayName:ROLL_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(roll_angle, "ROLL", 26, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: PITCH
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: PITCH_EN
+    // @DisplayName: PITCH_EN
+    // @Description: Displays degrees of pitch from level
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: PITCH_X
+    // @DisplayName: PITCH_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: PITCH_Y
+    // @DisplayName:PITCH_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(pitch_angle, "PITCH", 27, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: TEMP
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: TEMP_EN
+    // @DisplayName: TEMP_EN
+    // @Description: Displays temperature reported by barometer
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: TEMP_X
+    // @DisplayName: TEMP_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: TEMP_Y
+    // @DisplayName:TEMP_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(temp, "TEMP", 28, AP_OSD_Screen, AP_OSD_Setting),
-    
-    // @Group: HDOP
-    // @Path: AP_OSD_Setting.cpp
+
+    // @Param: HDOP_EN
+    // @DisplayName: HDOP_EN
+    // @Description: Displays Horizontal Dilution Of Position
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: HDOP_X
+    // @DisplayName: HDOP_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: HDOP_Y
+    // @DisplayName:HDOP_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(hdop, "HDOP", 29, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: WAYPOINT
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: WAYPOINT_EN
+    // @DisplayName: WAYPOINT_EN
+    // @Description: Displays bearing and distance to next waypoint
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: WAYPOINT_X
+    // @DisplayName: WAYPOINT_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: WAYPOINT_Y
+    // @DisplayName:WAYPOINT_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(waypoint, "WAYPOINT", 30, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: XTRACK
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: XTRACK_EN
+    // @DisplayName: XTRACK_EN
+    // @Description: Displays crosstrack error
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: XTRACK_X
+    // @DisplayName: XTRACK_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: XTRACK_Y
+    // @DisplayName: XTRACK_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(xtrack_error, "XTRACK", 31, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: DIST
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: DIST_EN
+    // @DisplayName: DIST_EN
+    // @Description: Displays total distance flown
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: DIST_X
+    // @DisplayName: DIST_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: DIST_Y
+    // @DisplayName: DIST_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(dist, "DIST", 32, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: STATS
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: STATS_EN
+    // @DisplayName: STATS_EN
+    // @Description: Displays flight stats
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: STATS_X
+    // @DisplayName: STATS_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: STATS_Y
+    // @DisplayName: STATS_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(stat, "STATS", 33, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: FLTIME
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: FLTIME_EN
+    // @DisplayName: FLTIME_EN
+    // @Description: Displays total flight time
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: FLTIME_X
+    // @DisplayName: FLTIME_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: FLTIME_Y
+    // @DisplayName: FLTIME_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(flightime, "FLTIME", 34, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: CLIMBEFF
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: CLIMBEFF_EN
+    // @DisplayName: CLIMBEFF_EN
+    // @Description: Displays climb efficiency(climb rate/current)
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: CLIMBEFF_X
+    // @DisplayName: CLIMBEFF_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: CLIMBEFF_Y
+    // @DisplayName: CLIMBEFF_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(climbeff, "CLIMBEFF", 35, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: EFF
-    // @Path: AP_OSD_Setting.cpp
-    AP_SUBGROUPINFO(eff, "EFF", 36, AP_OSD_Screen, AP_OSD_Setting),
-    
-    // @Group: BTEMP
-    // @Path: AP_OSD_Setting.cpp
-    AP_SUBGROUPINFO(btemp, "BTEMP", 37, AP_OSD_Screen, AP_OSD_Setting),
+    // @Param: EFF_EN
+    // @DisplayName: EFF_EN
+    // @Description: Displays flight efficiency(mah/km or /mi)
+    // @Values: 0:Disabled,1:Enabled
 
-    // @Group: ATEMP
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: EFF_X
+    // @DisplayName: EFF_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: EFF_Y
+    // @DisplayName: EFF_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
+    AP_SUBGROUPINFO(eff, "EFF", 36, AP_OSD_Screen, AP_OSD_Setting),
+
+    // @Param: BTEMP_EN
+    // @DisplayName: BTEMP_EN
+    // @Description: Displays temperature reported by second barometer
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BTEMP_X
+    // @DisplayName: BTEMP_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BTEMP_Y
+    // @DisplayName: BTEMP_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
+    AP_SUBGROUPINFO(btemp, "BTEMP", 37, AP_OSD_Screen, AP_OSD_Setting),
+ 
+    // @Param: ATEMP_EN
+    // @DisplayName: ATEMP_EN
+    // @Description: Displays temperature reported by airspeed sensor
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: ATEMP_X
+    // @DisplayName: ATEMP_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: ATEMPP_Y
+    // @DisplayName: ATEMP_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(atemp, "ATEMP", 38, AP_OSD_Screen, AP_OSD_Setting),
     
-    // @Group: BAT2VLT
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BAT2VLT_EN
+    // @DisplayName: BAT2VLT_EN
+    // @Description: Displays battery2 voltage
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BAT2VLT_X
+    // @DisplayName: BAT2VLT_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BAT2VLT_Y
+    // @DisplayName: BAT2VLT_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(bat2_vlt, "BAT2_VLT", 39, AP_OSD_Screen, AP_OSD_Setting),
 
-    // @Group: BAT2USED
-    // @Path: AP_OSD_Setting.cpp
+    // @Param: BAT2USED_EN
+    // @DisplayName: BAT2USED_EN
+    // @Description: Displays mah used by battery2
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: BAT2USED_X
+    // @DisplayName: BAT2USED_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: BAT2USED_Y
+    // @DisplayName: BAT2USED_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(bat2used, "BAT2USED", 40, AP_OSD_Screen, AP_OSD_Setting),
     
-    // @Group: ASPD2
-    // @Path: AP_OSD_Setting.cpp
+    
+    // @Param: ASPD2_EN
+    // @DisplayName: ALTITUDE_EN
+    // @Description: Enables display of speed reported directly from second airspeed sensor
+    // @Values: 0:Disabled,1:Enabled
+
+    // @Param: ASPD2_X
+    // @DisplayName: ASPD2_X
+    // @Description: Horizontal position on screen
+    // @Range: 0 29
+
+    // @Param: ASPD2_Y
+    // @DisplayName: ASPD2_Y
+    // @Description: Vertical position on screen
+    // @Range: 0 15
     AP_SUBGROUPINFO(aspd2, "ASPD2", 41, AP_OSD_Screen, AP_OSD_Setting),
     
     AP_GROUPEND