X and Pin button borders controllable separately

Also, more readable formatting