Make button border same color as button itself

Change-Id: I1fc85bed2b0d256d4889f241ab2ba2a88ec08c8a
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Move Schedule to lower position in menu

Change-Id: Ibcc98f296716b3aa9db9501fb06a786f52bfa6d8
Reviewed-by: Caroline Chao <caroline.chao@digia.com>