Merged code. Wifi dialog working. PhotoViewer.