reStructuredText editing

PyCharm Community Edition 3.1.1 (Windows 7)

When I have a .rst file with Heading and SubHeading, the  Structure Tool
Window doesn't show the correct hierarchy? That is:

   =======
    Title
   =======

   Heading
   =======

   SubHeading Level 1
   ~~~~~~~~~~~~~~~~~~

   SubHeading Level 2
   ------------------
Should look something like:

   Title
     Heading
       Subheading Level 1
         Subheading Level 2

Instead it looks like

   Title
   Heading
   Subheading Level 1
   Subheading Level 2

or maybe the Title could be put in the same place the filename is like:
myrestfile.rst (Title) to avoid that extra level of unuseful indentation.

Also, is there any way to automatically add the correct lines of
==/~/-/etc chars that indicate a line is a heading (ala the emacs
rst mode)? And automatically rotate between the various heading levels?