Interface polish for Bug 994997

PLEASE DO NOT MERGE YET. Will be adding more to the PR.

* https://bugzilla.mozilla.org/show_bug.cgi?id=994997
* https://romana.etherpad.mozilla.org/glow-dev-interaction-review-2014-04-10