Merge "make the wifi button go where it's supposed to."