diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index ba204baca..68f653d71 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -1,176 +1,175 @@
 <div id="register_popup" class="dialogPopup register-dialog" title="Register Airtime" style="display: none;">
-	<form id="register-form" method="<?php echo $this->element->getMethod() ?>" action="<?php echo $this->element->getAction() ?>" enctype="multipart/form-data">
-    		<fieldset>
-		    <dl class="zend_form">
-		    	<dt class="block-display info-text">
-            		Help Airtime improve by letting us know how you are using it. This info
-            		will be collected regularly in order to improve your user experience.
-            		<br /><br />
-            		In additon to that, this is how you vote for existing features. We actively remove
-            		features that are not used, so be sure to click "Yes, help Airtime" to keep
-            		your favourite features around.
+    <form id="register-form" method="<?php echo $this->element->getMethod() ?>" action="<?php echo $this->element->getAction() ?>" enctype="multipart/form-data">
+        <fieldset>
+            <dl class="zend_form">
+               <dt class="block-display info-text">
+                    Help Airtime improve by letting us know how you are using it. This info
+                    will be collected regularly in order to enhance your user experience.
+                    <br /><br />
+                    Click "Yes, help Airtime" and we'll make sure the features you use are
+                    constantly improving.
                 </dt>
-		    	<dd id="SupportFeedback-element" class="block-display">
-		            <label class="optional" for="SupportFeedback">
-		                <?php echo $this->element->getElement('SupportFeedback') ?>
-		                <strong><?php echo $this->element->getElement('SupportFeedback')->getLabel() ?></strong>
-		            </label>
-		            <?php if($this->element->getElement('SupportFeedback')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('SupportFeedback')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?>
-		        </dd>
+                <dd id="SupportFeedback-element" class="block-display">
+                    <label class="optional" for="SupportFeedback">
+                        <?php echo $this->element->getElement('SupportFeedback') ?>
+                        <strong><?php echo $this->element->getElement('SupportFeedback')->getLabel() ?></strong>
+                    </label>
+                    <?php if($this->element->getElement('SupportFeedback')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('SupportFeedback')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+                </dd>
                 <dt class="block-display info-text">
-            		Click the box below to advertise your station on 
-            		<a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>. 
-            		In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
+                    Click the box below to advertise your station on 
+                    <a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>. 
+                    In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
+                </dt>
+                <dd id="publicize-element" class="block-display">
+                    <label class="optional" for="Publicise">
+                        <?php echo $this->element->getElement('Publicise') ?>
+                        <strong><?php echo $this->element->getElement('Publicise')->getLabel() ?></strong>
+                    </label>
+                    <?php if($this->element->getElement('Publicise')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('Publicise')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?> 
+                </dd>
+            </dl>
+            <dl id="public-info" style="display:none;">
+                <dt id="stnName-label">
+                    <label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?>
+                        <span class="info-text-small">(Required)</span> :
+                    </label>
+                </dt>
+                <dd id="stnName-element">
+                    <?php echo $this->element->getElement('stnName') ?>
+                    <?php if($this->element->getElement('stnName')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('stnName')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?> 
+                </dd>
+                <dt id="Phone-label">
+                    <label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label>
+                </dt>
+                <dd id="Phone-element">
+                    <?php echo $this->element->getElement('Phone') ?>
+                    <span class="info-text-small">(for verification purposes only, will not be published)</span>
+                    <?php if($this->element->getElement('Phone')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('Phone')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?> 
+                </dd>
+                <dt id="Email-label">
+                    <label class="optional" for="Email"><?php echo $this->element->getElement('Email')->getLabel() ?></label>
+                </dt>
+                <dd id="Email-element">
+                    <?php echo $this->element->getElement('Email') ?>
+                    <span class="info-text-small">(for verification purposes only, will not be published)</span>
+                    <?php if($this->element->getElement('Email')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('Email')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?> 
+                </dd>
+                <dt id="StationWebSite-label">
+                    <label class="optional" for="StationWebSite"><?php echo $this->element->getElement('StationWebSite')->getLabel() ?></label>
+                </dt>
+                <dd id="StationWebSite-element">
+                    <?php echo $this->element->getElement('StationWebSite') ?>
+                    <?php if($this->element->getElement('StationWebSite')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('StationWebSite')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+                </dd>
+                <dt id="Country-label">
+                    <label class="optional" for="Country"><?php echo $this->element->getElement('Country')->getLabel() ?></label>
+                </dt>
+                <dd id="Country-element">
+                    <?php echo $this->element->getElement('Country') ?>
+                    <?php if($this->element->getElement('Country')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('Country')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+                </dd>
+                <dt id="City-label">
+                    <label class="optional" for="City"><?php echo $this->element->getElement('City')->getLabel() ?></label>
+                </dt>
+                <dd id="City-element">
+                    <?php echo $this->element->getElement('City') ?>
+                    <?php if($this->element->getElement('City')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('City')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+                </dd>
+                <dt id="Description-label">
+                    <label class="optional" for="Description"><?php echo $this->element->getElement('Description')->getLabel() ?></label>
+                </dt>
+                <dd id="Description-element">
+                    <?php echo $this->element->getElement('Description') ?>
+                    <?php if($this->element->getElement('Description')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('Description')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+                </dd>
+                <dt id="Logo-label" class="block-display">
+                    <label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label>
                 </dt>
-				<dd id="publicize-element" class="block-display">
-					<label class="optional" for="Publicise">
-		                <?php echo $this->element->getElement('Publicise') ?>
-		                <strong><?php echo $this->element->getElement('Publicise')->getLabel() ?></strong>
-		            </label>
-		            <?php if($this->element->getElement('Publicise')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('Publicise')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?> 
-				</dd>
-			</dl>
-			<dl id="public-info" style="display:none;">
-				<dt id="stnName-label">
-		            <label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?>
-		            	<span class="info-text-small">(Required)</span> :
-		            </label>
-		        </dt>
-		        <dd id="stnName-element">
-		            <?php echo $this->element->getElement('stnName') ?>
-		            <?php if($this->element->getElement('stnName')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('stnName')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?> 
-		        </dd>
-		        <dt id="Phone-label">
-		            <label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label>
-		        </dt>
-		        <dd id="Phone-element">
-		            <?php echo $this->element->getElement('Phone') ?>
-		            <span class="info-text-small">(for verification purposes only, will not be published)</span>
-		            <?php if($this->element->getElement('Phone')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('Phone')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?> 
-		        </dd>
-		        <dt id="Email-label">
-		            <label class="optional" for="Email"><?php echo $this->element->getElement('Email')->getLabel() ?></label>
-		        </dt>
-		        <dd id="Email-element">
-		            <?php echo $this->element->getElement('Email') ?>
-		            <span class="info-text-small">(for verification purposes only, will not be published)</span>
-		            <?php if($this->element->getElement('Email')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('Email')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?> 
-		        </dd>
-		        <dt id="StationWebSite-label">
-		            <label class="optional" for="StationWebSite"><?php echo $this->element->getElement('StationWebSite')->getLabel() ?></label>
-		        </dt>
-		        <dd id="StationWebSite-element">
-		            <?php echo $this->element->getElement('StationWebSite') ?>
-		            <?php if($this->element->getElement('StationWebSite')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('StationWebSite')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?>
-		        </dd>
-		        <dt id="Country-label">
-		            <label class="optional" for="Country"><?php echo $this->element->getElement('Country')->getLabel() ?></label>
-		        </dt>
-		        <dd id="Country-element">
-		            <?php echo $this->element->getElement('Country') ?>
-		            <?php if($this->element->getElement('Country')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('Country')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?>
-		        </dd>
-		        <dt id="City-label">
-		            <label class="optional" for="City"><?php echo $this->element->getElement('City')->getLabel() ?></label>
-		        </dt>
-		        <dd id="City-element">
-		            <?php echo $this->element->getElement('City') ?>
-		            <?php if($this->element->getElement('City')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('City')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?>
-		        </dd>
-		        <dt id="Description-label">
-		            <label class="optional" for="Description"><?php echo $this->element->getElement('Description')->getLabel() ?></label>
-		        </dt>
-		        <dd id="Description-element">
-		            <?php echo $this->element->getElement('Description') ?>
-		            <?php if($this->element->getElement('Description')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('Description')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?>
-		        </dd>
-		        <dt id="Logo-label" class="block-display">
-		            <label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label>
-		        </dt>
 
-		        <dd id="Logo-element">
-                	<?php if($this->element->getView()->logoImg){?>
-		        	<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
-		        	<?php }?>
+                <dd id="Logo-element">
+                    <?php if($this->element->getView()->logoImg){?>
+                    <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
+                    <?php }?>
                     
-		            <?php echo $this->element->getElement('Logo') ?>
-		            <p class="info-text">Note: Anything larger than 600x600 will be resized.</p>
-		            <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
-		                <ul class='errors'>
-		                    <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
-		                        <li><?php echo $error; ?></li>
-		                    <?php endforeach; ?>
-		                </ul>
-		            <?php endif; ?>
-		        </dd>
-		    </dl>
+                    <?php echo $this->element->getElement('Logo') ?>
+                    <p class="info-text">Note: Anything larger than 600x600 will be resized.</p>
+                    <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
+                        <ul class='errors'>
+                            <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+                </dd>
+            </dl>
             </fieldset>
-		
-			<div id="show_what_sending" style="display: block;">
-				<fieldset class="display_field toggle closed">
-				<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend>
-					<dl>
-						<?php echo $this->element->getElement('SendInfo') ?>
-					</dl>
-				</fieldset>
-			</div>
-			<div>
-			    <br>
-				<?php if(!$this->privacyChecked){?>
+        
+            <div id="show_what_sending" style="display: block;">
+                <fieldset class="display_field toggle closed">
+                <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend>
+                    <dl>
+                        <?php echo $this->element->getElement('SendInfo') ?>
+                    </dl>
+                </fieldset>
+            </div>
+            <div>
+                <br>
+                <?php if(!$this->privacyChecked){?>
                     <label class="optional" for="Privacy">
                         <?php echo $this->element->getElement('Privacy') ?>
                         <?php echo $this->element->getElement('Privacy')->getLabel() ?>
@@ -178,6 +177,6 @@
                 <?php }else{?>
                     <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
                 <?php }?>
-			</div>
-	</form>
+            </div>
+    </form>
 </div>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index e32d42136..46b93bb6c 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -4,10 +4,9 @@
         <dd id="SupportFeedback-element" style="width:90%;">
             <div class="info-text">
                 Help Airtime improve by letting us know how you are using it. This info
-                will be collected regularly in order to improve your user experience.<br /><br />
-                In additon to that, this is how you vote for existing features. We actively remove
-                features that are not used, so be sure to click "Yes, help Airtime" to keep
-                your favourite features around.
+                will be collected regularly in order to enhance your user experience.<br /><br />
+                Click "Yes, help Airtime" and we'll make sure the features you use are
+                constantly improving.
             </div>
             <label class="optional" for="SupportFeedback">
                 <?php echo $this->element->getElement('SupportFeedback') ?>