Bug 925970

* A followup round of changes to the awesome bar based on feedback from Peter La.