diff --git a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
index e7b39b413..2b06c936e 100644
--- a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
+++ b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
@@ -10,10 +10,10 @@
 					</luci-config-line>
 				</luci-config-lines>
 			</luci-config-section>
-			<luci-config-section ng-show="progress != 0">
-				<p translate>wifi.wps.paired.info</p>
+			<luci-config-section ng-show="progress == 1">
+				<p translate>wifi.wps.in.progress</p>
 			</luci-config-section>
-			<luci-config-section ng-show="wireless.status.wps.value && progress == 0">
+			<luci-config-section ng-show="wireless.status.wps.value && progress != 1">
 				<luci-config-lines ng-repeat="interface in wireless['@wifi-iface']">
 					<luci-config-line title="{{'Enable WPS on '|translate}} {{interface.ssid.value}}">
 						<switch id="enabled" name="enabled" ng-model="interface.wps_pbc.value" class="green" ng-change="save()" ></switch>
@@ -49,22 +49,24 @@
 				<p translate>wifi.wps.otherpin.info</p>
 				<luci-config-lines>
 					<luci-config-line title="{{'Enter your device PIN'|translate}}">
-						<input type="text" class="form-control input-lg" ng-model="data.userPIN" />
+						<input type="text" class="form-control input-lg" ng-model="data.userPIN" placeholder="{{'Enter your PIN here'|translate}}"/>
 					</luci-config-line>
 					<luci-config-line title="{{'Pair (within 2 minutes)'|translate}}">
-						<button ng-show="progress == 0" class="btn btn-lg btn-default" ng-click="onPairUserPIN()" translate>Pair</button>
+						<button class="btn btn-lg btn-default" ng-click="onPairUserPIN()" translate>Pair</button>
 					</luci-config-line>
 				</luci-config-lines>
 			</luci-config-section>
 		</luci-config>
 		<modal title="{{'Attempting to Pair'|translate}}" ng-show="progress != 0 && progress != 2">
-			<div ng-show="progress != 0" >
-				<i class="fa fa-spinner fa-spin fa-3x"/>
-				<p>{{timeRemaining}} <span translate>seconds remaining</span></p>
+			<div style="text-align: center;">
+				<div ng-show="progress != 0" >
+					<i class="fa fa-spinner fa-spin fa-3x"/>
+					<!--<p>{{timeRemaining}} <span translate>seconds remaining</span></p>-->
+				</div>
+				<p ng-show="progress == 0" translate>wifi.wpspairmodal.progressinfo.0</p>
+				<p ng-show="progress == 1" translate>wifi.wpspairmodal.progressinfo.1</p>
+				<p ng-show="progress == 2" translate>wifi.wpspairmodal.progressinfo.2</p>
 			</div>
-			<p ng-show="progress == 0" translate>wifi.wpspairmodal.progressinfo.0</p>
-			<p ng-show="progress == 1" translate>wifi.wpspairmodal.progressinfo.1</p>
-			<p ng-show="progress == 2" translate>wifi.wpspairmodal.progressinfo.2</p>
 		</modal>
 	</div>
 </luci-layout-with-sidebar>