diff --git a/app/build.gradle b/app/build.gradle
index 33b1b8a..7259c78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.odiousapps.weewxweather"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 5014
-        versionName "0.5.14"
+        versionCode 6000
+        versionName "0.6.0"
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 58df25b..bb07742 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Common.java b/app/src/main/java/com/odiousapps/weewxweather/Common.java
index 02b80b2..6891b0e 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Common.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Common.java
@@ -248,7 +248,7 @@ void SetBoolPref(String name, boolean value)
 		SetStringPref(name, val);
 	}
 
-	@SuppressWarnings("unused")
+	@SuppressWarnings("SameParameterValue")
 	boolean GetBoolPref(String name)
 	{
 		return GetBoolPref(name, false);
@@ -639,10 +639,11 @@ void SendIntents()
 		context.sendBroadcast(intent);
 		Common.LogMessage("update_intent broadcast.");
 
-		RemoteViews remoteViews = buildUpdate(context);
-		ComponentName thisWidget = new ComponentName(context, WidgetProvider.class);
-		AppWidgetManager manager = AppWidgetManager.getInstance(context);
-		manager.updateAppWidget(thisWidget, remoteViews);
+		intent = new Intent(context, WidgetProvider.class);
+		intent.setAction("android.appwidget.action.APPWIDGET_UPDATE");
+		int ids[] = AppWidgetManager.getInstance(context.getApplicationContext()).getAppWidgetIds(new ComponentName(context.getApplicationContext(), WidgetProvider.class));
+		intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,ids);
+		context.sendBroadcast(intent);
 		Common.LogMessage("widget intent broadcasted");
 	}
 
diff --git a/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java b/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java
index 8a97f39..50004e8 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java
@@ -2,9 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlarmManager;
 import android.app.AlertDialog;
-import android.app.PendingIntent;
 import android.app.ProgressDialog;
 import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
@@ -74,6 +72,9 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
 	private Button b2;
 	private Button b3;
 	private boolean showSettings = true;
+	private Spinner s1;
+	private Switch show_indoor, metric_forecasts;
+	private TextView tv;
 
 	private ProgressDialog dialog;
 
@@ -113,76 +114,23 @@ protected void onCreate(Bundle savedInstanceState)
             e.printStackTrace();
         }
 
-	    doSettings();
-	    common.setAlarm("MainActivity");
-    }
-
-    private void showUpdateAvailable()
-	{
-		final AlertDialog.Builder d = new AlertDialog.Builder(this);
-		d.setTitle("weeWX Weather App");
-		d.setMessage("This app has been updated but the server you are connecting to hasn't updated the Inigo Plugin for weeWX. Fields may not show up properly until weeWX is updated.");
-		d.setPositiveButton("OK", null);
-		d.setIcon(R.drawable.ic_launcher_foreground);
-		d.show();
-	}
-
-    private void doSettings()
-    {
 	    settingsURL = findViewById(R.id.settings);
-	    settingsURL.setText(common.GetStringPref("SETTINGS_URL", "https://example.com/weewx/inigo-settings.txt"));
-	    settingsURL.setOnFocusChangeListener(new View.OnFocusChangeListener()
-	    {
-		    @Override
-		    public void onFocusChange(View v, boolean hasFocus)
-		    {
-			    if (!hasFocus)
-				    hideKeyboard(v);
-		    }
-	    });
-
 	    customURL = findViewById(R.id.customURL);
-	    customURL.setText(common.GetStringPref("custom_url", ""));
-	    customURL.setOnFocusChangeListener(new View.OnFocusChangeListener()
-	    {
-		    @Override
-		    public void onFocusChange(View v, boolean hasFocus)
-		    {
-			    if (!hasFocus)
-				    hideKeyboard(v);
-		    }
-	    });
-
-	    pos = common.GetIntPref("updateInterval", 1);
-	    Spinner s1 = findViewById(R.id.spinner1);
+	    s1 = findViewById(R.id.spinner1);
 	    ArrayAdapter<String> adapter = new ArrayAdapter<>(common.context, R.layout.spinner_layout, paths);
 	    adapter.setDropDownViewResource(R.layout.spinner_layout);
 	    s1.setAdapter(adapter);
-	    s1.setSelection(pos);
 	    s1.setOnItemSelectedListener(this);
 
-	    Switch metric_forecasts = findViewById(R.id.metric_forecasts);
-	    metric_forecasts.setChecked(common.GetBoolPref("metric", true));
-
-	    Switch show_indoor = findViewById(R.id.show_indoor);
-	    show_indoor.setChecked(common.GetBoolPref("showIndoor", false));
-
-	    Switch wifi_only = findViewById(R.id.wifi_only);
-	    wifi_only.setChecked(common.GetBoolPref("onlyWIFI", false));
-
-	    boolean radarforecast = common.GetBoolPref("radarforecast", true);
-	    RadioButton showForecast = findViewById(R.id.showForecast);
-	    if(!radarforecast)
-		    showForecast.setChecked(true);
+	    metric_forecasts = findViewById(R.id.metric_forecasts);
+	    show_indoor = findViewById(R.id.show_indoor);
 
 	    b1 = findViewById(R.id.button);
 	    b2 = findViewById(R.id.deleteData);
 	    b3 = findViewById(R.id.aboutButton);
 
-	    LinearLayout settingsLayout = findViewById(R.id.settingsLayout);
-	    settingsLayout.setVisibility(View.VISIBLE);
-	    LinearLayout aboutLayout = findViewById(R.id.aboutLayout);
-	    aboutLayout.setVisibility(View.GONE);
+	    fgColour = findViewById(R.id.fgPicker);
+	    bgColour = findViewById(R.id.bgPicker);
 
 	    b1.setOnClickListener(new View.OnClickListener()
 	    {
@@ -217,9 +165,9 @@ public void onClick(View arg0)
 	    {
 		    public void onClick(View arg0)
 		    {
-		    	if(showSettings)
+			    if(showSettings)
 			    {
-			    	showSettings = false;
+				    showSettings = false;
 				    b1.setVisibility(View.INVISIBLE);
 				    b2.setVisibility(View.INVISIBLE);
 				    b3.setText(R.string.settings2);
@@ -243,7 +191,64 @@ public void onClick(View arg0)
 		    }
 	    });
 
-	    TextView tv = findViewById(R.id.aboutText);
+	    tv = findViewById(R.id.aboutText);
+		doSettings();
+
+	    common.setAlarm("MainActivity");
+    }
+
+    private void showUpdateAvailable()
+	{
+		final AlertDialog.Builder d = new AlertDialog.Builder(this);
+		d.setTitle("weeWX Weather App");
+		d.setMessage("This app has been updated but the server you are connecting to hasn't updated the Inigo Plugin for weeWX. Fields may not show up properly until weeWX is updated.");
+		d.setPositiveButton("OK", null);
+		d.setIcon(R.drawable.ic_launcher_foreground);
+		d.show();
+	}
+
+    private void doSettings()
+    {
+	    settingsURL.setText(common.GetStringPref("SETTINGS_URL", "https://example.com/weewx/inigo-settings.txt"));
+	    settingsURL.setOnFocusChangeListener(new View.OnFocusChangeListener()
+	    {
+		    @Override
+		    public void onFocusChange(View v, boolean hasFocus)
+		    {
+			    if (!hasFocus)
+				    hideKeyboard(v);
+		    }
+	    });
+
+	    customURL.setText(common.GetStringPref("custom_url", ""));
+	    customURL.setOnFocusChangeListener(new View.OnFocusChangeListener()
+	    {
+		    @Override
+		    public void onFocusChange(View v, boolean hasFocus)
+		    {
+			    if (!hasFocus)
+				    hideKeyboard(v);
+		    }
+	    });
+
+	    pos = common.GetIntPref("updateInterval", 1);
+	    s1.setSelection(pos);
+
+	    metric_forecasts.setChecked(common.GetBoolPref("metric", true));
+	    show_indoor.setChecked(common.GetBoolPref("showIndoor", false));
+
+	    Switch wifi_only = findViewById(R.id.wifi_only);
+	    wifi_only.setChecked(common.GetBoolPref("onlyWIFI", false));
+
+	    boolean radarforecast = common.GetBoolPref("radarforecast", true);
+	    RadioButton showForecast = findViewById(R.id.showForecast);
+	    if(!radarforecast)
+		    showForecast.setChecked(true);
+
+	    LinearLayout settingsLayout = findViewById(R.id.settingsLayout);
+	    settingsLayout.setVisibility(View.VISIBLE);
+	    LinearLayout aboutLayout = findViewById(R.id.aboutLayout);
+	    aboutLayout.setVisibility(View.GONE);
 
 	    String lines = "<html><body>Big thanks to the <a href='http://weewx.com'>weeWX project</a>, as this app " +
 			    "wouldn't be possible otherwise.<br><br>" +
@@ -256,7 +261,6 @@ public void onClick(View arg0)
 
 	    // https://github.com/Pes8/android-material-color-picker-dialog
 
-	    fgColour = findViewById(R.id.fgPicker);
 	    String hex = "#" + Integer.toHexString(common.GetIntPref("fgColour", 0xFF000000)).toUpperCase();
 	    fgColour.setText(hex);
 	    fgColour.setOnClickListener(new View.OnClickListener()
@@ -268,7 +272,6 @@ public void onClick(View v)
 		    }
 	    });
 
-	    bgColour = findViewById(R.id.bgPicker);
 	    hex = "#" + Integer.toHexString(common.GetIntPref("bgColour", 0xFFFFFFFF)).toUpperCase();
 	    bgColour.setText(hex);
 	    bgColour.setOnClickListener(new View.OnClickListener()
diff --git a/app/src/main/java/com/odiousapps/weewxweather/RNAutoStart.java b/app/src/main/java/com/odiousapps/weewxweather/RNAutoStart.java
index 90f5e80..da08f88 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/RNAutoStart.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/RNAutoStart.java
@@ -1,7 +1,5 @@
 package com.odiousapps.weewxweather;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Stats.java b/app/src/main/java/com/odiousapps/weewxweather/Stats.java
index c35d67d..30f083d 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Stats.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Stats.java
@@ -240,8 +240,8 @@ private void updateFields()
 	    	return;
 
 //      Today Stats
-	    checkFields((TextView) rootView.findViewById(R.id.textView), bits[56]);
-	    checkFields((TextView) rootView.findViewById(R.id.textView2), bits[54] + " " + bits[55]);
+	    checkFields((TextView)rootView.findViewById(R.id.textView), bits[56]);
+	    checkFields((TextView)rootView.findViewById(R.id.textView2), bits[54] + " " + bits[55]);
 
 	    double percent = (seekBar.getProgress() + 90) / 100.00;
 	    NumberFormat formatter = new DecimalFormat("#0.00");
diff --git a/app/src/main/java/com/odiousapps/weewxweather/UpdateCheck.java b/app/src/main/java/com/odiousapps/weewxweather/UpdateCheck.java
index 23ee5a3..344cd8f 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/UpdateCheck.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/UpdateCheck.java
@@ -1,7 +1,5 @@
 package com.odiousapps.weewxweather;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Weather.java b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
index f3926d6..8163b94 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Weather.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
@@ -17,7 +17,6 @@
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.io.BufferedReader;
@@ -48,6 +47,8 @@ private void checkFields(TextView tv, String txt)
 
     private View updateFields()
     {
+	    int iw = 17;
+
         Common.LogMessage("updateFields()");
         String bits[] = common.GetStringPref("LastDownload","").split("\\|");
         if(bits.length < 65)
@@ -55,42 +56,105 @@ private View updateFields()
 
         checkFields((TextView)rootView.findViewById(R.id.textView), bits[56]);
         checkFields((TextView)rootView.findViewById(R.id.textView2), bits[54] + " " + bits[55]);
-        checkFields((TextView)rootView.findViewById(R.id.textView3), bits[0] + bits[60]);
 
+	    WebView current = rootView.findViewById(R.id.current);
+	    current.getSettings().setUserAgentString(Common.UA);
+	    current.setOnLongClickListener(new View.OnLongClickListener()
+	    {
+		    @Override
+		    public boolean onLongClick(View v)
+		    {
+			    Vibrator vibrator = (Vibrator)common.context.getSystemService(Context.VIBRATOR_SERVICE);
+			    if(vibrator != null)
+				    vibrator.vibrate(250);
+			    Common.LogMessage("current long press");
+			    updateFields();
+			    return true;
+		    }
+	    });
+
+	    current.setWebViewClient(new WebViewClient()
+	    {
+		    @Override
+		    public boolean shouldOverrideUrlLoading(WebView view, String url)
+		    {
+			    return false;
+		    }
+	    });
+	    current.setWebChromeClient(new WebChromeClient()
+	    {
+		    @Override
+		    public boolean onConsoleMessage(ConsoleMessage cm)
+		    {
+			    return true;
+		    }
+	    });
+
+	    String stmp;
+	    StringBuilder sb = new StringBuilder();
+
+	    String header = "<html><body>";
+	    String footer = "</body></html>";
+	    sb.append(header);
+
+	    sb.append("<table style='width:100%;border:0px;'>");
+
+	    stmp = "<tr><td style='font-size:36pt;text-align:right;'>" + bits[0] + bits[60] + "</td>";
 	    if(bits.length > 203)
-		    checkFields((TextView)rootView.findViewById(R.id.appTemp), "AT: " + bits[203] + bits[60]);
+		    stmp += "<td style='font-size:18pt;text-align:right;vertical-align:bottom;'>AT: " + bits[203] + bits[60] +"</td></tr></table>";
+	    else
+	    	stmp += "<td>&nbsp</td></tr></table>";
+
+	    sb.append(stmp);
+	    sb.append("<table style='width:100%;border:0px;'>");
 
-        checkFields((TextView)rootView.findViewById(R.id.textView4), bits[25] + bits[61]);
-        checkFields((TextView)rootView.findViewById(R.id.textView5), bits[37] + bits[63]);
-        checkFields((TextView)rootView.findViewById(R.id.textView6), bits[29]);
-        checkFields((TextView)rootView.findViewById(R.id.textView7), bits[6] + bits[64]);
+	    stmp = "<tr><td><img style='width:" + iw + "px' src='windsock.png'></td><td>" + bits[25] + bits[61] + "</td>" +
+			    "<td style='text-align:right;'>" + bits[1] + bits[60] + "</td><td><img style='width:" + iw + "px' src='barometer.png'></td></tr>";
+	    sb.append(stmp);
+
+	    stmp = "<tr><td><img style='width:" + iw + "px' src='compass.png'></td><td>" + bits[37] + bits[63] + "</td>" +
+			    "<td style='text-align:right;'>" + bits[6] + bits[64] + "</td><td><img style='width:" + iw + "px' src='humidity.png'></td></tr>";
+	    sb.append(stmp);
 
 	    String rain = bits[20] + bits[62] + " since mn";
 	    if(bits.length > 160 && !bits[160].equals(""))
 		    rain = bits[158] + bits[62] + " since " + bits[160];
 
-        checkFields((TextView)rootView.findViewById(R.id.textView8), rain);
-        checkFields((TextView)rootView.findViewById(R.id.textView9), bits[12] + bits[60]);
-        checkFields((TextView)rootView.findViewById(R.id.textView10), bits[45] + "UVI");
-        checkFields((TextView)rootView.findViewById(R.id.textView11), bits[43] + "W/m\u00B2");
-
-        checkFields((TextView)rootView.findViewById(R.id.textView12), bits[57]);
-        checkFields((TextView)rootView.findViewById(R.id.textView13), bits[58]);
-        checkFields((TextView)rootView.findViewById(R.id.textView14), bits[47]);
-        checkFields((TextView)rootView.findViewById(R.id.textView15), bits[48]);
+	    stmp = "<tr><td><img style='width:" + iw + "px' src='umbrella.png'></td><td>" + rain + "</td>" +
+			    "<td style='text-align:right;'>" + bits[12] + bits[60] + "</td><td><img style='width:" + iw + "px' src='droplet.png'></td></tr>";
+	    sb.append(stmp);
 
-	    LinearLayout homerow = rootView.findViewById(R.id.homerow);
-        if(common.GetBoolPref("showIndoor", false))
-			homerow.setVisibility(View.VISIBLE);
-        else
-	        homerow.setVisibility(View.GONE);
+	    stmp = "<tr><td><img style='width:" + iw + "px' src='sunglasses.png'></td><td>" + bits[45] + "UVI</td>" +
+			    "<td style='text-align:right;'>" + bits[43] + "W/m\u00B2</td><td><img style='width:" + iw + "px' src='sunglasses.png'></td></tr>";
+	    sb.append(stmp);
 
-	    if(bits.length > 166)
+	    if(bits.length > 202 && common.GetBoolPref("showIndoor", false))
 	    {
-		    checkFields((TextView) rootView.findViewById(R.id.hometemp), bits[161] + bits[60]);
-		    checkFields((TextView) rootView.findViewById(R.id.homehumid), bits[166] + bits[64]);
+		    stmp = "<tr><td><img style='width:" + iw + "px' src='home.png'></td><td>" + bits[161] + bits[60] + "</td>" +
+				    "<td style='text-align:right;'>" + bits[166] + bits[64] + "</td><td><img style='width:" + iw + "px' src='home.png'></td></tr>";
+		    sb.append(stmp);
 	    }
 
+	    stmp = "</table>";
+	    sb.append(stmp);
+
+	    sb.append("<table style='width:100%;border:0px;'>");
+
+	    stmp = "<tr>" +
+			    "<td><img style='width:" + iw + "px' src='sunrise.png'></td><td>" + bits[57] + "</td>" +
+			    "<td><img style='width:" + iw + "px' src='sunset.png'></td><td>" + bits[58] + "</td>" +
+			    "<td><img style='width:" + iw + "px' src='moonrise.png'></td><td>" + bits[47] + "</td>" +
+	            "<td><img style='width:" + iw + "px' src='moonset.png'></td><td>" + bits[48] + "</td></tr>";
+	    sb.append(stmp);
+
+	    stmp = "</table>";
+	    sb.append(stmp);
+
+	    sb.append(footer);
+	    String html = sb.toString().trim();
+
+	    current.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
+
         return rootView;
     }
 
@@ -252,7 +316,6 @@ public void run()
 					    wv.loadDataWithBaseURL("file:///android_res/drawable/", fc, "text/html", "utf-8", null);
 				    }
 			    });
-
 		    } else if(fctype.toLowerCase().equals("weatherzone")) {
 			    String[] content = common.processWZ(data);
 			    if(content == null || content.length <= 0)
@@ -269,14 +332,6 @@ public void run()
 					    wv.loadDataWithBaseURL("file:///android_res/drawable/", fc, "text/html", "utf-8", null);
 				    }
 			    });
-
-			    /*
-			    	    if(common.GetStringPref("fctype", "yahoo").toLowerCase().equals("yahoo"))
-		    im.setImageResource(R.drawable.purple);
-	    else if(common.GetStringPref("fctype", "yahoo").toLowerCase().equals("weatherzone"))
-	        im.setImageResource(R.drawable.wz);
-			     */
-
 		    }
 	    }
     }
diff --git a/app/src/main/java/com/odiousapps/weewxweather/WidgetProvider.java b/app/src/main/java/com/odiousapps/weewxweather/WidgetProvider.java
index 66de651..a44faa0 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/WidgetProvider.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/WidgetProvider.java
@@ -1,6 +1,5 @@
 package com.odiousapps.weewxweather;
 
-import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -12,6 +11,17 @@ public class WidgetProvider extends AppWidgetProvider
 {
     Common common = null;
 
+	@Override
+	public void onReceive(Context context, Intent intent)
+	{
+		Common.LogMessage("onReceive() called..");
+		AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+		int[] appWidgetIds = intent.getIntArrayExtra("appWidgetIds");
+
+		if(appWidgetIds != null && appWidgetIds.length > 0)
+			onUpdate(context, appWidgetManager, appWidgetIds);
+	}
+
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds)
     {
diff --git a/app/src/main/res/layout/fragment_weather.xml b/app/src/main/res/layout/fragment_weather.xml
index 4be1170..32fac19 100644
--- a/app/src/main/res/layout/fragment_weather.xml
+++ b/app/src/main/res/layout/fragment_weather.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.SwipeRefreshLayout
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipeToRefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -24,289 +23,10 @@
             android:layout_height="wrap_content"
             android:gravity="center"/>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="top"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.6"
-                android:fontFamily="sans-serif"
-                android:textAlignment="viewEnd"
-                android:textSize="48sp"
-                android:typeface="normal"/>
-
-            <TextView
-                android:id="@+id/appTemp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_weight="0.4"
-                android:gravity="end"
-                android:textSize="24sp"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/windsock"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/windsock"/>
-
-            <TextView
-                android:id="@+id/textView4"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="start"/>
-
-            <TextView
-                android:id="@+id/textView5"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="end"/>
-
-            <ImageView
-                android:id="@+id/barometer"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/barometer"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/compass"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/compass"/>
-
-            <TextView
-                android:id="@+id/textView6"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="start"/>
-
-            <TextView
-                android:id="@+id/textView7"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="end"/>
-
-            <ImageView
-                android:id="@+id/humidity"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/humidity"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/umbrella"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/umbrella"/>
-
-            <TextView
-                android:id="@+id/textView8"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="start"/>
-
-            <TextView
-                android:id="@+id/textView9"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="end"/>
-
-            <ImageView
-                android:id="@+id/dew"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/droplet"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/sunnies1"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/sunglasses"/>
-
-            <TextView
-                android:id="@+id/textView10"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="start"/>
-
-            <TextView
-                android:id="@+id/textView11"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="end"/>
-
-            <ImageView
-                android:id="@+id/sunnies2"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/sunglasses"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/homerow"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/home1"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/home"/>
-
-            <TextView
-                android:id="@+id/hometemp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="start"/>
-
-            <TextView
-                android:id="@+id/homehumid"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".40"
-                android:gravity="end"/>
-
-            <ImageView
-                android:id="@+id/home4"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/home"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/sunrise"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/sunrise"/>
-
-            <TextView
-                android:id="@+id/textView12"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.20"
-                android:gravity="center"/>
-
-            <ImageView
-                android:id="@+id/sunset"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/sunset"/>
-
-            <TextView
-                android:id="@+id/textView13"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.20"
-                android:gravity="center"/>
-
-            <ImageView
-                android:id="@+id/moonrise"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/moonrise"/>
-
-            <TextView
-                android:id="@+id/textView14"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.20"
-                android:gravity="center"/>
-
-            <ImageView
-                android:id="@+id/moonset"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:layout_weight="0.05"
-                android:contentDescription="@string/empty"
-                android:src="@drawable/moonset"/>
-
-            <TextView
-                android:id="@+id/textView15"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.20"
-                android:gravity="center"/>
-        </LinearLayout>
-
-        <TextView
+        <WebView
+            android:id="@+id/current"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="6sp"/>
+            android:layout_height="wrap_content"/>
 
         <WebView
             android:id="@+id/radar"
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index 2b9ce80..6c62dd1 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -2,7 +2,6 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     android:minWidth="120dp"
                     android:minHeight="60dp"
-                    android:updatePeriodMillis="1800000"
                     android:initialLayout="@layout/widget"
                     android:resizeMode="horizontal|vertical"
                     android:previewImage="@drawable/preview">