Inline guidance tweaks

https://www.pivotaltracker.com/story/show/54272186