Fix borders

Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
9 files changed