Squashed commit of PD's navbar stuff

commit d26dc2fca3154903652fa39a1705c86b4cc583d9
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Tue Apr 2 19:47:17 2013 -0400

    navbar: fixes in settings

    this also moves the transparency settings to underneath the navbar since it
    seems like a more logical place for it.  Also cleans up some confusing strings.

    Change-Id: Ib267fb1521577c5f2befa8011e8d211891d4c636

commit 418466a35b0ee6c13f9e930fefe10d353b55a0bc
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Tue Apr 2 15:44:05 2013 -0400

    add a blank spacer to our navbar targets

    Change-Id: I7a97f4753961530c736ee6dbaf826fe4b827743f

Change-Id: Ib7d4072588bed3f9fcc81205f0e5ec97f9f85ef3