Revert "Bug 888121 - [HD] The UI layout is weird. r=mchen"

This reverts commit 701ad9efc4f12d0b6322a7d3da50b6f5694d50db.
Bug 888121 - [HD] The UI layout is weird. r=mwu