fix layout issues with border

Change-Id: I92e7a86524a40f379eaa39af4b56500c33e97423
2 files changed