bug 1076878 - Ensure navbar adapts to device size

Two more elements pushing the width -- this should do it.