fixed small thing i had left out on arrows before
tweaking content box size
Merge remote-tracking branch 'origin/tal' into wes
Merge remote-tracking branch 'origin/tal' into wes
Merge remote-tracking branch 'origin/wes' into jeff