diff --git a/lib/DDG/Goodie/SunInfo.pm b/lib/DDG/Goodie/SunInfo.pm
index ef52f0993..1b3b22163 100644
--- a/lib/DDG/Goodie/SunInfo.pm
+++ b/lib/DDG/Goodie/SunInfo.pm
@@ -20,7 +20,7 @@ category 'calculations';
 topics 'everyday';
 attribution github => ['https://github.com/duckduckgo', 'duckduckgo'];
 
-my $time_format      = '%l:%M%P';
+my $time_format      = '%l:%M %P';
 my $datestring_regex = datestring_regex();
 
 my $sunrise_svg = goodie_img_tag({
diff --git a/share/goodie/sun_info/sun_info.css b/share/goodie/sun_info/sun_info.css
index f918f07aa..860efd00a 100755
--- a/share/goodie/sun_info/sun_info.css
+++ b/share/goodie/sun_info/sun_info.css
@@ -7,8 +7,6 @@
 .zci--answer .zci--suninfo .suninfo--header {
     font-size:0.75em;
     font-weight:300;
-    padding-bottom: 0.5em;
-    text-align: bottom;
 }
 
 .zci--answer .zci--suninfo .suninfo--row span {
@@ -32,15 +30,10 @@
     margin: 0 0.5em;
 }
 
-.zci--answer .zci--suninfo .suninfo--setbox {
+.zci--answer .zci--suninfo .suninfo--setbox,
+.zci--answer .zci--suninfo .suninfo--risebox {
     display:inline-block;
     width:48px;
     height:48px;
     padding: 0 0 0 0.5em;
 }
-.zci--answer .zci--suninfo .suninfo--risebox {
-    display:inline-block;
-    width:48px;
-    height:48px;
-}
-
diff --git a/t/SunInfo.t b/t/SunInfo.t
index 3ae3c89a8..273fd0a74 100644
--- a/t/SunInfo.t
+++ b/t/SunInfo.t
@@ -12,8 +12,8 @@ zci is_cached   => 0;
 my @now = (qr/^On.*Phoenixville, PA.*AM.*PM\.$/, html => qr/Phoenixville.*AM.*PM/);
 my @aug = (qr/^On 30 Aug.*AM.*PM\.$/,            html => qr/Phoenixville.*AM.*PM/);
 my @exact = (
-    'On 01 Jan 2015, sunrise in Phoenixville, PA is at 7:23AM; sunset at 4:46PM.',
-    html => qr{^<div class='zci--suninfo'><div class='suninfo--header text--secondary'><span class='ddgsi'>.*<img.*4:46PM</span></span></div></div>$},
+    'On 01 Jan 2015, sunrise in Phoenixville, PA is at 7:23 AM; sunset at 4:46 PM.',
+    html => qr{^<div class='zci--suninfo'><div class='suninfo--header text--secondary'><span class='ddgsi'>.*<img.*4:46 PM</span></span></div></div>$},
 );
 
 ddg_goodie_test(