Ensure no borders causing horizontal scrollbars with narrow screens

Change-Id: If55effb1e138783c276e44751ce913c12efef509