Added Layouts and WiFi searching