Fix ordering of border CSS