Rearranged sections of Nav Stack tutorial.

rviz_basics.md

@@ -1,15 +1,36 @@
 ## Visualizing with RViz
 
+You can utilize RViz to visualize Stretch's sensor information. To begin, run the stretch driver launch file.
+
+```bash
+roslaunch stretch_core stretch_driver.roslaunch
+```
+
+Then run the following command to bring up a simple RViz configuration of the Stretch robot.
+```bash
+rosrun rviz rviz -d `rospack find stretch_core`/rviz/stretch_simple_test.rviz
+```
+An RViz window should open, allowing you to see the various DisplayTypes in the display tree on the left side of the window.
+
+![image](images/simple_rviz.png)
+
+If you want the visualize Stretch's [tf transform tree](http://wiki.ros.org/rviz/DisplayTypes/TF), you need to add the display type to the RViz window. First, click on the *Add* button and include the *TF*  type to the display. You will then see all of the transform frames of the Stretch robot and the visualization can be toggled off and on by clicking the checkbox next to the tree. Below is a gif for reference.
+
+![image](images/rviz_adding_tf.gif)
+
+There are further tutorials for RViz and can be found [here](http://wiki.ros.org/rviz/Tutorials).
+
+
+## Running RViz and Gazebo
 Let's bringup stretch in the willowgarage world from the [gazebo basics tutorial](gazebo_basics.md) and RViz by using the following command.
 
 ```bash
-roslaunch stretch_gazebo stretch_willowgarage_world.launch rviz:=true
+roslaunch stretch_gazebo gazebo.launch world:=worlds/willowgarage.world rviz:=true
 ```
 the `rviz` flag will open an RViz window  to visualize a variety of ROS topics.
-![image](images/willowgarage_with_rviz.png)
 
-If you want the visualize the [tf transform tree](http://wiki.ros.org/rviz/DisplayTypes/TF), you can add this to the your display. First click on the *Add* button and include the *TF*  type to the display. You will then see all of the transform frames of the Stretch robot and the visualization can be toggled off and on by clicking the checkbox next the tree. Below is a gif for reference.
+![image](images/willowgarage_with_rviz.png)
 
-![image](images/rviz_adding_tf.gif)
+Bringup the [keyboard teleop](teleoperating_stretch.md) to drive Stretch and observe its sensor input.
 
-Bringup the [keyboard teleop](teleoperating_stretch.md) to drive Stretch and observe its sensor input. Further tutorials for RViz can be found [here](http://wiki.ros.org/rviz/Tutorials).
+**Next Tutorial:** [Navigation Stack](navigation_stack.md)