Edits and navbar fix.  Broken: gallery

Change-Id: I7f6d36f4ea1db7af40d2f0f5c0fbd6e3b80f6f6a