Merged #9 manually (Added Wi-Fi switch to Settings pane)