Wifi changes & Moved some options to the common side