small ui cleanups for color border

Change-Id: I76142afdb44a45936bf32a36b3b45ffdc729308e
7 files changed