Fix border toggling