Change border color and main button position