Bug 962414 - Follow-up, Rocketbar layout updates