Merge "Make gutter between folders and docs smaller." into nyc-andromeda-dev