diff --git a/SwiftRadio.xcodeproj/project.pbxproj b/SwiftRadio.xcodeproj/project.pbxproj
index d3c9472..deaf516 100644
--- a/SwiftRadio.xcodeproj/project.pbxproj
+++ b/SwiftRadio.xcodeproj/project.pbxproj
@@ -58,6 +58,13 @@
 		94D260981B45E8B800DE671C /* Track.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D260971B45E8B800DE671C /* Track.swift */; };
 		94D30EA71AD07A880024FE96 /* StationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D30EA61AD07A880024FE96 /* StationTableViewCell.swift */; };
 		94E9761C1B1A8F3200F52B1E /* UIImage+DropShadow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E9761B1B1A8F3200F52B1E /* UIImage+DropShadow.swift */; };
+		B05F1B1B2CC79582007D10D5 /* BaseScreenProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B1A2CC79582007D10D5 /* BaseScreenProtocol.swift */; };
+		B05F1B1E2CC795E7007D10D5 /* BundleId.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B1D2CC795E7007D10D5 /* BundleId.swift */; };
+		B05F1B202CC79893007D10D5 /* XCTest+Allure.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B1F2CC79893007D10D5 /* XCTest+Allure.swift */; };
+		B05F1B222CC798D0007D10D5 /* XCUIElement+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B212CC798D0007D10D5 /* XCUIElement+Actions.swift */; };
+		B05F1B242CC79908007D10D5 /* XCUIElement+Asserts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B232CC79908007D10D5 /* XCUIElement+Asserts.swift */; };
+		B05F1B262CC79929007D10D5 /* XCUIElement+Waiting.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B252CC79929007D10D5 /* XCUIElement+Waiting.swift */; };
+		B05F1B292CC79F26007D10D5 /* SafariPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05F1B282CC79F26007D10D5 /* SafariPage.swift */; };
 		CAA8FDB52000614600050F77 /* RadioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA8FDB42000614600050F77 /* RadioPlayer.swift */; };
 		CF72ACE721F7155200461EED /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CF72ACE621F714D000461EED /* Main.storyboard */; };
 		DAEBB1E525161E5B0065ECF0 /* MainPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB1E425161E5B0065ECF0 /* MainPage.swift */; };
@@ -68,11 +75,9 @@
 		DAEBB1F0251623960065ECF0 /* RadioInfoPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB1EF251623960065ECF0 /* RadioInfoPage.swift */; };
 		DAEBB1F2251627690065ECF0 /* AppInfoPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB1F1251627690065ECF0 /* AppInfoPage.swift */; };
 		DAEBB1FE251633AB0065ECF0 /* SmokeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB1FD251633AB0065ECF0 /* SmokeTest.swift */; };
-		DAEBB20125165D900065ECF0 /* XCUIElementExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB20025165D900065ECF0 /* XCUIElementExtensions.swift */; };
 		DAEBB2032517421E0065ECF0 /* StationInfoTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB2022517421E0065ECF0 /* StationInfoTest.swift */; };
 		DAEBB2052517491B0065ECF0 /* AppInfoTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB2042517491B0065ECF0 /* AppInfoTest.swift */; };
 		DAEBB2082517521D0065ECF0 /* RadioInfoTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB2072517521D0065ECF0 /* RadioInfoTest.swift */; };
-		DAEBB20A25175DC50065ECF0 /* RadioInfoTestExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAEBB20925175DC50065ECF0 /* RadioInfoTestExtension.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -144,6 +149,13 @@
 		94D260971B45E8B800DE671C /* Track.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Track.swift; sourceTree = "<group>"; };
 		94D30EA61AD07A880024FE96 /* StationTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StationTableViewCell.swift; sourceTree = "<group>"; };
 		94E9761B1B1A8F3200F52B1E /* UIImage+DropShadow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+DropShadow.swift"; sourceTree = "<group>"; };
+		B05F1B1A2CC79582007D10D5 /* BaseScreenProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseScreenProtocol.swift; sourceTree = "<group>"; };
+		B05F1B1D2CC795E7007D10D5 /* BundleId.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleId.swift; sourceTree = "<group>"; };
+		B05F1B1F2CC79893007D10D5 /* XCTest+Allure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTest+Allure.swift"; sourceTree = "<group>"; };
+		B05F1B212CC798D0007D10D5 /* XCUIElement+Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+Actions.swift"; sourceTree = "<group>"; };
+		B05F1B232CC79908007D10D5 /* XCUIElement+Asserts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+Asserts.swift"; sourceTree = "<group>"; };
+		B05F1B252CC79929007D10D5 /* XCUIElement+Waiting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+Waiting.swift"; sourceTree = "<group>"; };
+		B05F1B282CC79F26007D10D5 /* SafariPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariPage.swift; sourceTree = "<group>"; };
 		CAA8FDB42000614600050F77 /* RadioPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioPlayer.swift; sourceTree = "<group>"; };
 		CF72ACE621F714D000461EED /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		DAEBB1E425161E5B0065ECF0 /* MainPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainPage.swift; sourceTree = "<group>"; };
@@ -154,11 +166,9 @@
 		DAEBB1EF251623960065ECF0 /* RadioInfoPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioInfoPage.swift; sourceTree = "<group>"; };
 		DAEBB1F1251627690065ECF0 /* AppInfoPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfoPage.swift; sourceTree = "<group>"; };
 		DAEBB1FD251633AB0065ECF0 /* SmokeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmokeTest.swift; sourceTree = "<group>"; };
-		DAEBB20025165D900065ECF0 /* XCUIElementExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCUIElementExtensions.swift; sourceTree = "<group>"; };
 		DAEBB2022517421E0065ECF0 /* StationInfoTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StationInfoTest.swift; sourceTree = "<group>"; };
 		DAEBB2042517491B0065ECF0 /* AppInfoTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfoTest.swift; sourceTree = "<group>"; };
 		DAEBB2072517521D0065ECF0 /* RadioInfoTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioInfoTest.swift; sourceTree = "<group>"; };
-		DAEBB20925175DC50065ECF0 /* RadioInfoTestExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioInfoTestExtension.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -182,6 +192,7 @@
 		2C5545BB1C1124DE00728469 /* SwiftRadioUITests */ = {
 			isa = PBXGroup;
 			children = (
+				B05F1B1C2CC795CD007D10D5 /* Data */,
 				2C5545BE1C1124DE00728469 /* Info.plist */,
 				DAEBB1E225161E240065ECF0 /* Page */,
 				DAEBB1FF25165D750065ECF0 /* Extensions */,
@@ -342,6 +353,22 @@
 			name = Model;
 			sourceTree = "<group>";
 		};
+		B05F1B1C2CC795CD007D10D5 /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				B05F1B1D2CC795E7007D10D5 /* BundleId.swift */,
+			);
+			path = Data;
+			sourceTree = "<group>";
+		};
+		B05F1B272CC79F0D007D10D5 /* AnotherApp */ = {
+			isa = PBXGroup;
+			children = (
+				B05F1B282CC79F26007D10D5 /* SafariPage.swift */,
+			);
+			path = AnotherApp;
+			sourceTree = "<group>";
+		};
 		CAA7C15A1FD77F3A003CABDF /* FRadioPlayer */ = {
 			isa = PBXGroup;
 			children = (
@@ -355,12 +382,14 @@
 		DAEBB1E225161E240065ECF0 /* Page */ = {
 			isa = PBXGroup;
 			children = (
+				B05F1B272CC79F0D007D10D5 /* AnotherApp */,
 				DAEBB1E425161E5B0065ECF0 /* MainPage.swift */,
 				DAEBB1F1251627690065ECF0 /* AppInfoPage.swift */,
 				DAEBB1EF251623960065ECF0 /* RadioInfoPage.swift */,
 				DAEBB1EB251621B50065ECF0 /* StationDetailsPage.swift */,
 				DAEBB1E925161F7F0065ECF0 /* CommonPage.swift */,
 				DAEBB1ED251622BF0065ECF0 /* StationInfoPage.swift */,
+				B05F1B1A2CC79582007D10D5 /* BaseScreenProtocol.swift */,
 			);
 			path = Page;
 			sourceTree = "<group>";
@@ -380,8 +409,10 @@
 		DAEBB1FF25165D750065ECF0 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				DAEBB20025165D900065ECF0 /* XCUIElementExtensions.swift */,
-				DAEBB20925175DC50065ECF0 /* RadioInfoTestExtension.swift */,
+				B05F1B1F2CC79893007D10D5 /* XCTest+Allure.swift */,
+				B05F1B212CC798D0007D10D5 /* XCUIElement+Actions.swift */,
+				B05F1B232CC79908007D10D5 /* XCUIElement+Asserts.swift */,
+				B05F1B252CC79929007D10D5 /* XCUIElement+Waiting.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -500,16 +531,21 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DAEBB20125165D900065ECF0 /* XCUIElementExtensions.swift in Sources */,
 				DAEBB2052517491B0065ECF0 /* AppInfoTest.swift in Sources */,
 				DAEBB1E825161EE50065ECF0 /* CommonTest.swift in Sources */,
-				DAEBB20A25175DC50065ECF0 /* RadioInfoTestExtension.swift in Sources */,
+				B05F1B292CC79F26007D10D5 /* SafariPage.swift in Sources */,
 				DAEBB1EE251622BF0065ECF0 /* StationInfoPage.swift in Sources */,
 				DAEBB1EC251621B50065ECF0 /* StationDetailsPage.swift in Sources */,
+				B05F1B1E2CC795E7007D10D5 /* BundleId.swift in Sources */,
+				B05F1B242CC79908007D10D5 /* XCUIElement+Asserts.swift in Sources */,
+				B05F1B222CC798D0007D10D5 /* XCUIElement+Actions.swift in Sources */,
 				DAEBB2082517521D0065ECF0 /* RadioInfoTest.swift in Sources */,
 				DAEBB1F0251623960065ECF0 /* RadioInfoPage.swift in Sources */,
+				B05F1B202CC79893007D10D5 /* XCTest+Allure.swift in Sources */,
 				DAEBB1EA25161F7F0065ECF0 /* CommonPage.swift in Sources */,
 				DAEBB1FE251633AB0065ECF0 /* SmokeTest.swift in Sources */,
+				B05F1B262CC79929007D10D5 /* XCUIElement+Waiting.swift in Sources */,
+				B05F1B1B2CC79582007D10D5 /* BaseScreenProtocol.swift in Sources */,
 				DAEBB1F2251627690065ECF0 /* AppInfoPage.swift in Sources */,
 				DAEBB1E525161E5B0065ECF0 /* MainPage.swift in Sources */,
 				DAEBB2032517421E0065ECF0 /* StationInfoTest.swift in Sources */,
diff --git a/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/lysikovboris.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/lysikovboris.xcuserdatad/UserInterfaceState.xcuserstate
index 1472cfc..6c81002 100644
Binary files a/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/lysikovboris.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftRadio.xcodeproj/project.xcworkspace/xcuserdata/lysikovboris.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/SwiftRadio.xcodeproj/xcuserdata/lysikovboris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftRadio.xcodeproj/xcuserdata/lysikovboris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..a7990fa
--- /dev/null
+++ b/SwiftRadio.xcodeproj/xcuserdata/lysikovboris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "333E62C9-2962-45BC-A521-16EFA68ABD59"
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9DF43FBA-E9FB-4E66-8F6A-06BF7BA8ADE0"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "SwiftRadioUITests/Page/RadioInfoPage.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "11"
+            endingLineNumber = "11"
+            landmarkName = "RadioInfoPage"
+            landmarkType = "14">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/SwiftRadio/Main.storyboard b/SwiftRadio/Main.storyboard
index bd1f942..938e607 100755
--- a/SwiftRadio/Main.storyboard
+++ b/SwiftRadio/Main.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kdl-ej-Zz5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kdl-ej-Zz5">
     <device id="retina5_5" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,11 +21,11 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                             </imageView>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="dhg-xW-Q3M">
-                                <rect key="frame" x="0.0" y="44" width="414" height="648"/>
+                                <rect key="frame" x="0.0" y="64" width="414" height="628"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="StationCell" rowHeight="90" id="hMr-La-1Ga" customClass="StationTableViewCell" customModule="SwiftRadio" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="414" height="90"/>
+                                        <rect key="frame" x="0.0" y="50" width="414" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hMr-La-1Ga" id="NhW-Qy-GCO">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="90"/>
@@ -41,10 +42,10 @@
                                                     </constraints>
                                                 </imageView>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="g0b-Y4-SBe" userLabel="Labels Stack View">
-                                                    <rect key="frame" x="136" y="22.333333333333332" width="250" height="46.333333333333343"/>
+                                                    <rect key="frame" x="136" y="22.333333333333332" width="254" height="46.333333333333343"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Station Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="hQQ-6f-sYl">
-                                                            <rect key="frame" x="0.0" y="0.0" width="250" height="20.333333333333332"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="254" height="20.333333333333332"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="stationName">
                                                                 <bool key="isElement" value="YES"/>
                                                             </accessibility>
@@ -53,7 +54,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Desc" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ptr-mN-34N">
-                                                            <rect key="frame" x="0.0" y="28.333333333333329" width="250" height="18"/>
+                                                            <rect key="frame" x="0.0" y="28.333333333333329" width="254" height="18"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="stationDesc"/>
                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -99,7 +100,7 @@
                                                     <constraint firstAttribute="width" constant="40" id="V1I-VJ-0aF"/>
                                                 </constraints>
                                             </imageView>
-                                            <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LhZ-Go-zL7" userLabel="Now Playing Button">
+                                            <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LhZ-Go-zL7" userLabel="Now Playing Button">
                                                 <rect key="frame" x="40" y="5.6666666666666288" width="374" height="33"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="nowPlayingButton"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
@@ -124,7 +125,8 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="Rf9-Sj-GRF"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="Rf9-Sj-GRF" firstAttribute="bottom" secondItem="y05-35-5xn" secondAttribute="bottom" id="0Ab-ql-g3F"/>
                             <constraint firstItem="dhg-xW-Q3M" firstAttribute="leading" secondItem="Rf9-Sj-GRF" secondAttribute="leading" id="8YJ-iI-LfY"/>
@@ -138,7 +140,6 @@
                             <constraint firstItem="Rf9-Sj-GRF" firstAttribute="trailing" secondItem="dhg-xW-Q3M" secondAttribute="trailing" id="tj2-C3-q2r"/>
                             <constraint firstItem="y05-35-5xn" firstAttribute="top" secondItem="dhg-xW-Q3M" secondAttribute="bottom" id="wF0-Xy-rSA"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Rf9-Sj-GRF"/>
                     </view>
                     <navigationItem key="navigationItem" title="Swift Radio" id="OKR-cw-CyI">
                         <barButtonItem key="leftBarButtonItem" image="icon-hamburger" id="CEi-nw-1dN">
@@ -172,7 +173,7 @@
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K6v-dQ-Ces" userLabel="Pop-up View">
                                 <rect key="frame" x="82" y="255" width="250" height="206"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4YL-N4-xkC" userLabel="Close Button">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4YL-N4-xkC" userLabel="Close Button">
                                         <rect key="frame" x="8" y="8" width="16" height="16"/>
                                         <accessibility key="accessibilityConfiguration" identifier="closeButton"/>
                                         <constraints>
@@ -186,7 +187,7 @@
                                         </connections>
                                     </button>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="7mN-C5-TQp">
-                                        <rect key="frame" x="27" y="27.333333333333314" width="196.33333333333334" height="164.66666666666666"/>
+                                        <rect key="frame" x="27" y="27.333333333333314" width="196" height="164.66666666666666"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="swift-radio-black" translatesAutoresizingMaskIntoConstraints="NO" id="6p5-La-eLs" customClass="SpringImageView" customModule="SwiftRadio" customModuleProvider="target">
                                                 <rect key="frame" x="8" y="0.0" width="180" height="70"/>
@@ -202,7 +203,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wSU-lN-ktR">
                                                 <rect key="frame" x="12" y="80" width="172" height="32"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Be5-hL-qtx" customClass="SpringButton" customModule="SwiftRadio" customModuleProvider="target">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Be5-hL-qtx" customClass="SpringButton" customModule="SwiftRadio" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="86" height="32"/>
                                                         <color key="backgroundColor" red="0.24706900119781494" green="0.56329798698425293" blue="0.81052231788635254" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="aboutButton"/>
@@ -229,7 +230,7 @@
                                                             <segue destination="XU1-sh-p0s" kind="presentation" id="2md-Am-VN1"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NDa-S4-n0n" customClass="SpringButton" customModule="SwiftRadio" customModuleProvider="target">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NDa-S4-n0n" customClass="SpringButton" customModule="SwiftRadio" customModuleProvider="target">
                                                         <rect key="frame" x="86" y="0.0" width="86" height="32"/>
                                                         <color key="backgroundColor" red="0.20579981803894043" green="0.49201503396034241" blue="0.70883911848068237" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="websiteButton"/>
@@ -265,7 +266,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Matt Fecher &amp; Fethi El Hassasna" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hYi-2l-6dj" userLabel="Matthew Fecher &amp; Fethi El Hassasna">
-                                                <rect key="frame" x="0.0" y="149" width="196.33333333333334" height="15.666666666666657"/>
+                                                <rect key="frame" x="0.0" y="149" width="196" height="15.666666666666657"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="authorsLabel"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
@@ -285,6 +286,7 @@
                                 </constraints>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Ogy-0t-iKH"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Ogy-0t-iKH" firstAttribute="trailing" secondItem="GpH-v2-Q95" secondAttribute="trailing" id="2ZC-Gw-pfb"/>
@@ -294,7 +296,6 @@
                             <constraint firstItem="Ogy-0t-iKH" firstAttribute="centerX" secondItem="K6v-dQ-Ces" secondAttribute="centerX" id="rSF-5v-a7F"/>
                             <constraint firstAttribute="bottom" secondItem="GpH-v2-Q95" secondAttribute="bottom" id="xS9-r4-beH"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Ogy-0t-iKH"/>
                     </view>
                     <connections>
                         <outlet property="backgroundView" destination="GpH-v2-Q95" id="1HK-ui-e7J"/>
@@ -327,7 +328,7 @@
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="WmY-ug-Nhz" userLabel="Controls Stack View">
-                                <rect key="frame" x="99" y="385" width="216" height="45"/>
+                                <rect key="frame" x="99" y="405" width="216" height="45"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W6n-gy-z3a" userLabel="PreviousButton">
                                         <rect key="frame" x="0.0" y="0.0" width="45" height="45"/>
@@ -392,7 +393,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="a3Z-1t-AAA" userLabel="Volume Stack View">
-                                <rect key="frame" x="12" y="442" width="390" height="60"/>
+                                <rect key="frame" x="12" y="462" width="390" height="60"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="top" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vol-min" translatesAutoresizingMaskIntoConstraints="NO" id="Kmj-vC-DQe">
                                         <rect key="frame" x="0.0" y="22" width="18" height="16"/>
@@ -438,17 +439,17 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="8xJ-4F-WCE" userLabel="Labels Stack View">
-                                <rect key="frame" x="12" y="514" width="390" height="65.666666666666629"/>
+                                <rect key="frame" x="12" y="534" width="390" height="65.666666666666629"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Song Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="KC8-ZG-rx5" userLabel="Song Label" customClass="SpringLabel" customModule="SwiftRadio" customModuleProvider="target">
-                                        <rect key="frame" x="124.66666666666667" y="0.0" width="140.66666666666663" height="33.666666666666664"/>
+                                        <rect key="frame" x="124.66666666666666" y="0.0" width="140.99999999999997" height="33.666666666666664"/>
                                         <accessibility key="accessibilityConfiguration" identifier="songLabel"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Artist Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="v3l-q6-g0h" userLabel="Artist Label">
-                                        <rect key="frame" x="143.66666666666666" y="41.666666666666629" width="103" height="24"/>
+                                        <rect key="frame" x="143.33333333333334" y="41.666666666666629" width="103.66666666666666" height="24"/>
                                         <accessibility key="accessibilityConfiguration" identifier="artistLabel"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -471,7 +472,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RA9-OX-Xr1" userLabel="Station Desc Label">
-                                <rect key="frame" x="70" y="323" width="274" height="21"/>
+                                <rect key="frame" x="70" y="343" width="274" height="21"/>
                                 <accessibility key="accessibilityConfiguration" identifier="stationDeskLabel"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="wJP-em-2hX"/>
@@ -529,7 +530,8 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="aXI-gd-81R"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="djB-ds-tW4" firstAttribute="bottom" secondItem="Ub6-am-LP5" secondAttribute="bottom" constant="10" id="0Po-4M-k2q"/>
                             <constraint firstItem="Ub6-am-LP5" firstAttribute="centerY" secondItem="GIj-4c-kRh" secondAttribute="centerY" id="2Ym-J6-vxU"/>
@@ -556,7 +558,6 @@
                             <constraint firstItem="aXI-gd-81R" firstAttribute="trailing" secondItem="uXf-Wr-UiK" secondAttribute="trailing" id="wlz-dV-IhI"/>
                             <constraint firstItem="WmY-ug-Nhz" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="xjT-ZW-MWx"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="aXI-gd-81R"/>
                     </view>
                     <navigationItem key="navigationItem" title="SubPop Records" id="M1Z-0o-hNV" userLabel="Station Title"/>
                     <nil key="simulatedBottomBarMetrics"/>
@@ -586,7 +587,7 @@
                     <navigationItem key="navigationItem" id="A8J-Gu-F1O"/>
                     <nil key="simulatedBottomBarMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="kFn-Yc-mPh">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.1175440177321434" green="0.11671449244022369" blue="0.14129963517189026" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -616,7 +617,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="s0F-Po-Xgl" userLabel="Header Stack View">
-                                <rect key="frame" x="16" y="64" width="382" height="70"/>
+                                <rect key="frame" x="16" y="84" width="382" height="70"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stationImage" translatesAutoresizingMaskIntoConstraints="NO" id="AHg-sm-9St">
                                         <rect key="frame" x="0.0" y="0.0" width="110" height="70"/>
@@ -650,7 +651,7 @@
                                 </subviews>
                             </stackView>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cJI-ka-9k5">
-                                <rect key="frame" x="20" y="150" width="374" height="192"/>
+                                <rect key="frame" x="20" y="170" width="374" height="192"/>
                                 <accessibility key="accessibilityConfiguration" identifier="stationTextView"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="lessThanOrEqual" priority="750" constant="340" id="ulU-kP-hZB"/>
@@ -676,7 +677,8 @@
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="ttU-mg-6S4"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="ttU-mg-6S4" firstAttribute="trailing" secondItem="fdb-DQ-3fT" secondAttribute="trailing" id="50c-4f-6Rq"/>
                             <constraint firstItem="cJI-ka-9k5" firstAttribute="top" secondItem="s0F-Po-Xgl" secondAttribute="bottom" constant="16" id="86j-HT-NPL"/>
@@ -693,7 +695,6 @@
                             <constraint firstItem="cJI-ka-9k5" firstAttribute="leading" secondItem="s9T-KA-lNI" secondAttribute="leadingMargin" id="sRg-kF-Iue"/>
                             <constraint firstItem="s0F-Po-Xgl" firstAttribute="leading" secondItem="ttU-mg-6S4" secondAttribute="leading" constant="16" id="ybl-xY-OYx"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="ttU-mg-6S4"/>
                     </view>
                     <navigationItem key="navigationItem" id="tsR-lP-4XL"/>
                     <connections>
@@ -778,7 +779,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Yo0-Y9-DbN" userLabel="Contact Stack View">
                                         <rect key="frame" x="0.0" y="0.0" width="382" height="67"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SBf-Hj-mZ8">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SBf-Hj-mZ8">
                                                 <rect key="frame" x="111" y="0.0" width="160" height="33"/>
                                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="linkButton"/>
@@ -791,7 +792,7 @@
                                                     <action selector="websiteButtonDidTouch:" destination="XU1-sh-p0s" eventType="touchUpInside" id="nwb-md-4Wf"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1G4-to-fqL">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1G4-to-fqL">
                                                 <rect key="frame" x="160" y="37" width="62" height="30"/>
                                                 <accessibility key="accessibilityConfiguration" identifier="emailButton"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
@@ -824,7 +825,8 @@
                                 </subviews>
                             </stackView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="K72-2b-Mye"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="7AK-QT-5Xg" firstAttribute="top" secondItem="IL8-0k-WGh" secondAttribute="bottom" constant="8" id="1d5-ec-UU6"/>
                             <constraint firstItem="FDJ-eG-GLD" firstAttribute="leading" secondItem="K72-2b-Mye" secondAttribute="leading" id="8dd-cT-wBO"/>
@@ -840,7 +842,6 @@
                             <constraint firstItem="7AK-QT-5Xg" firstAttribute="leading" secondItem="gkA-NG-Bu8" secondAttribute="leadingMargin" id="u9o-qn-lSS"/>
                             <constraint firstItem="IL8-0k-WGh" firstAttribute="top" secondItem="gkA-NG-Bu8" secondAttribute="top" constant="20" id="yCY-yU-Wbh"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="K72-2b-Mye"/>
                     </view>
                     <navigationItem key="navigationItem" id="3ak-PV-PMV"/>
                 </viewController>
@@ -851,7 +852,7 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="Z22-bU-Ytg"/>
+        <segue reference="2md-Am-VN1"/>
     </inferredMetricsTieBreakers>
     <resources>
         <image name="NowPlayingBars" width="19.666666030883789" height="19"/>
@@ -869,5 +870,8 @@
         <image name="swift-radio-black" width="180" height="70"/>
         <image name="vol-max" width="16.666666030883789" height="14"/>
         <image name="vol-min" width="11" height="12.666666984558105"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/SwiftRadioUITests/Data/BundleId.swift b/SwiftRadioUITests/Data/BundleId.swift
new file mode 100644
index 0000000..ccc2183
--- /dev/null
+++ b/SwiftRadioUITests/Data/BundleId.swift
@@ -0,0 +1,13 @@
+//
+//  BundleId.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+enum BundleId: String {
+    case app = "com.borisLysikov.SwiftRadio"
+    case safari = "com.apple.mobilesafari"
+}
+
diff --git a/SwiftRadioUITests/Extensions/RadioInfoTestExtension.swift b/SwiftRadioUITests/Extensions/RadioInfoTestExtension.swift
deleted file mode 100644
index 65470ce..0000000
--- a/SwiftRadioUITests/Extensions/RadioInfoTestExtension.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  RadioInfoTestExtension.swift
-//  SwiftRadioUITests
-//
-//  Created by Борис Лысиков on 20.09.2020.
-//  Copyright © 2020 matthewfecher.com. All rights reserved.
-//
-
-import XCTest
-
-extension RadioInfoTest {
-    
-    func acceptNoMailAlert() {
-        let monitor = addUIInterruptionMonitor(withDescription: "No Mail Accounts") {
-            let okButton = $0.buttons.element(boundBy: 0)
-            if okButton.exists {
-                okButton.tapElement()
-                return true
-            }
-            return false
-        }
-        app.tap()
-        removeUIInterruptionMonitor(monitor)
-    }
-    
-    func acceptNoSendEMailAlert() {
-        let monitor = addUIInterruptionMonitor(withDescription: "Could Not Send Email") {
-            let okButton = $0.buttons.element(boundBy: 0)
-            if okButton.exists {
-                okButton.tapElement()
-                return true
-            }
-            return false
-        }
-        app.tap()
-        removeUIInterruptionMonitor(monitor)
-    }
-    
-}
diff --git a/SwiftRadioUITests/Extensions/XCTest+Allure.swift b/SwiftRadioUITests/Extensions/XCTest+Allure.swift
new file mode 100644
index 0000000..84bf50c
--- /dev/null
+++ b/SwiftRadioUITests/Extensions/XCTest+Allure.swift
@@ -0,0 +1,44 @@
+//
+//  XCTest+Allure.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+import XCTest
+
+public extension String {
+    static let allureName = "allure.name"
+    static let allureLabel = "allure.label."
+    static let allureId = "AS_ID"
+}
+
+public extension XCTest {
+    @discardableResult
+    func allureId(_ value: String) -> XCTest {
+        label(.allureId, value)
+        return self
+    }
+
+    @discardableResult
+    func label(_ name: String, _ value: String) -> XCTest {
+        XCTContext.runActivity(named: .allureLabel + name + ":" + value, block: { _ in })
+        return self
+    }
+
+    @discardableResult
+    func name(_ value: String) -> XCTest {
+        XCTContext.runActivity(named: .allureName + ":" + value, block: { _ in })
+        return self
+    }
+
+    @discardableResult
+    func step(_ name: String, step: () -> Void) -> XCTest {
+        XCTContext.runActivity(named: "Step: " + name) { _ in
+            step()
+        }
+        return self
+    }
+}
+
diff --git a/SwiftRadioUITests/Extensions/XCUIElement+Actions.swift b/SwiftRadioUITests/Extensions/XCUIElement+Actions.swift
new file mode 100644
index 0000000..77ca547
--- /dev/null
+++ b/SwiftRadioUITests/Extensions/XCUIElement+Actions.swift
@@ -0,0 +1,184 @@
+//
+//  XCUIElement+Actions.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+import XCTest
+
+extension XCUIElement {
+    func enterText(
+        _ text: String,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait(
+            file: file,
+            line: line
+        )
+        let isElementField = elementType == .textField || elementType == .searchField || elementType == .secureTextField
+        let isElementHasFocus = value(forKey: "hasKeyboardFocus") as? Bool ?? false
+        switch (isElementField, isElementHasFocus) {
+        case (true, true):
+            clearText()
+            typeText(text)
+        case (true, false):
+            tapElement()
+            clearText()
+            typeText(text)
+        default:
+            XCTAssert(
+                true,
+                "Элемент должен быть типа textField, securityTextField или searchField, но это: \(elementType.rawValue)",
+                file: file,
+                line: line
+            )
+        }
+    }
+
+    func clearText() -> Self {
+        guard let stringValue = value as? String else {
+            return self
+        }
+        // workaround for apple bug
+        guard placeholderValue != stringValue else {
+            return self
+        }
+
+        var deleteString = [String]()
+        for _ in stringValue {
+            deleteString.append(XCUIKeyboardKey.delete.rawValue)
+        }
+        typeText(deleteString.joined())
+
+        return self
+    }
+
+    func tapElement(
+        timeout: TimeInterval = waitTimeout,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait(
+            for: .exists,
+            time: timeout,
+            file: file,
+            line: line
+        )
+        tap()
+    }
+
+    func tapOnCoordinate(at point: CGPoint) {
+        let normalized = coordinate(withNormalizedOffset: .zero)
+        let offset = CGVector(dx: point.x, dy: point.y)
+        let coordinate = normalized.withOffset(offset)
+        coordinate.tap()
+    }
+
+    func scrollToElement(
+        _ element: XCUIElement,
+        scrollLimit: Int = 10,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        var count = 0
+        while !element.isHittable && count <= scrollLimit {
+            swipeUp()
+            count += 1
+        }
+        XCTAssertFalse(
+            count == scrollLimit,
+            "Элемент не отображается на экране после \(count) свайпов",
+            file: file,
+            line: line
+        )
+    }
+
+    func scrollToElementDown(
+        _ element: XCUIElement,
+        scrollLimit: Int = 10,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        var count = 0
+        while !element.isHittable && count <= scrollLimit {
+            swipeDown()
+            count += 1
+        }
+        XCTAssertFalse(
+            count == scrollLimit,
+            "Элемент не отображается на экране после \(count) свайпов",
+            file: file,
+            line: line
+        )
+    }
+
+    func setSliderPosition(
+        timeout: TimeInterval = waitTimeout,
+        at position: CGFloat,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait(
+            for: .exists,
+            time: timeout,
+            file: file,
+            line: line
+        )
+        adjust(toNormalizedSliderPosition: position)
+    }
+
+    enum SwipeDirection {
+        case up
+        case down
+        case left
+        case right
+    }
+
+    func swipeScreen(direction: SwipeDirection) {
+        let app = XCUIApplication()
+        let bottom = app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.8))
+        let top = app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.2))
+        let left = app.coordinate(withNormalizedOffset: CGVector(dx: 0.1, dy: 0.5))
+        let right = app.coordinate(withNormalizedOffset: CGVector(dx: 0.9, dy: 0.5))
+
+        switch direction {
+        case .up:
+            bottom.press(forDuration: 0, thenDragTo: top)
+        case .down:
+            top.press(forDuration: 0, thenDragTo: bottom)
+        case .left:
+            right.press(forDuration: 0, thenDragTo: left)
+        case .right:
+            left.press(forDuration: 0, thenDragTo: right)
+        }
+    }
+
+    func closeScreenBySwipe() {
+        let app = XCUIApplication()
+        let left = app.coordinate(withNormalizedOffset: CGVector(dx: 0, dy: 0.5))
+        let right = app.coordinate(withNormalizedOffset: CGVector(dx: 0.9, dy: 0.5))
+
+        left.press(forDuration: 1, thenDragTo: right)
+    }
+
+    enum SwipeMiniPlayerDirection {
+        case left
+        case right
+    }
+
+    func swipeMiniPlayer(direction: SwipeMiniPlayerDirection) {
+        let app = XCUIApplication()
+        let left = app.coordinate(withNormalizedOffset: CGVector(dx: 0.1, dy: 0.88))
+        let right = app.coordinate(withNormalizedOffset: CGVector(dx: 0.75, dy: 0.88))
+
+        switch direction {
+        case .left:
+            right.press(forDuration: 0, thenDragTo: left)
+        case .right:
+            left.press(forDuration: 0, thenDragTo: right)
+        }
+    }
+}
diff --git a/SwiftRadioUITests/Extensions/XCUIElement+Asserts.swift b/SwiftRadioUITests/Extensions/XCUIElement+Asserts.swift
new file mode 100644
index 0000000..354ce8e
--- /dev/null
+++ b/SwiftRadioUITests/Extensions/XCUIElement+Asserts.swift
@@ -0,0 +1,120 @@
+//
+//  XCUIElement+Asserts.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+import XCTest
+
+extension XCUIElement {
+    func verifyElement(
+        event: ElementEvent = .exists,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait(for: event, file: file, line: line)
+    }
+
+    func verifySwitch(
+        isOn: Bool,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        var switchState: String {
+            isOn == true ? "1" : "0"
+        }
+        XCTAssertEqual(
+            value as? String,
+            switchState,
+            "Ожидается состояние переключателя: \(isOn), но состояние переключателя \(!isOn)",
+            file: file,
+            line: line
+        )
+    }
+
+    var switchIsOn: Bool {
+        guard let value = value as? String else {
+            return false
+        }
+        return value == "1"
+    }
+
+    func verifyLabel(
+        equal: String,
+        isEqual: Bool = true,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait()
+        XCTAssertEqual(
+            label == equal,
+            isEqual,
+            isEqual ?
+                "Лэйбл должен совпадать с: \(equal)," +
+                " но он имеет значение: \(label)" :
+                "Лэйбл не должен совпадать с: \(equal)," +
+                " но он имеет значение: \(label)",
+            file: file,
+            line: line
+        )
+    }
+    
+    func verifyLabelContain(
+        contain: String,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait()
+        XCTAssertTrue(
+            label.contains(contain),
+            "Лейбл должен содержать: \(contain)" +
+            " но он имеет значение: \(label)",
+            file: file,
+            line: line
+        )
+    }
+
+    func verifyLabelsNotEqual(
+        expression1: [String],
+        expression2: [String],
+        isEqual: Bool = true,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait()
+        XCTAssertNotEqual(
+            expression1 == expression2,
+            isEqual,
+            isEqual ?
+                "Лэйбл должен совпадать с: \(expression2)," +
+                " но он имеет значение: \(label)" :
+                "Лэйбл не должен совпадать с: \(expression1)," +
+                " но он имеет значение: \(label)",
+            file: file,
+            line: line
+        )
+    }
+
+    func verifyText(
+        equal: String?,
+        isEqual: Bool = true,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        wait()
+        XCTAssertEqual(
+            value as? String == equal,
+            isEqual,
+            isEqual ?
+                "Текст должен совпадать с \(equal)," +
+                " но он имеет значение: \(String(describing: value as? String))" :
+                "Текст не должен совпадать с: \(equal)," +
+                " но он имеет значение: \(String(describing: value as? String))",
+            file: file,
+            line: line
+        )
+    }
+}
+
diff --git a/SwiftRadioUITests/Extensions/XCUIElement+Waiting.swift b/SwiftRadioUITests/Extensions/XCUIElement+Waiting.swift
new file mode 100644
index 0000000..5c57bcc
--- /dev/null
+++ b/SwiftRadioUITests/Extensions/XCUIElement+Waiting.swift
@@ -0,0 +1,68 @@
+//
+//  XCUIElement+Waiting.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+import XCTest
+
+extension XCUIElement {
+    /// The period of time in seconds to wait explicitly for expectations.
+    static let waitTimeout: TimeInterval = 5
+
+    enum ElementEvent: String {
+        case enabled = "enabled == true"
+        case disabled = "enabled == false"
+        case exists = "exists == true"
+        case hidden = "exists == false"
+        case hittable = "hittable == true"
+        case unhittable = "hittable == false"
+        case existsAndEnabled = "exists == true AND enabled == true"
+        case existAndHittable = "exists == true AND hittable == true"
+        case existHittableAndEnabled =
+            "exists == true AND hittable == true AND enabled == true"
+    }
+
+    func wait(
+        for event: ElementEvent = .exists,
+        time: TimeInterval = waitTimeout,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        let expectation = makeWaitExpectation(event: event)
+        let waitResult = XCTWaiter.wait(for: [expectation], timeout: time)
+
+        switch waitResult {
+        case .timedOut:
+            let element: XCUIElement = self
+            let errorMessage =
+                "Элемент: \(element) - недоступен в течении \(time) секунд"
+            XCTFail(errorMessage, file: file, line: line)
+        case .interrupted:
+            XCTFail(
+                "Ожидание элемента прервано до того, как оно оправдалось или неоправдалось по истечении \(time) секунд",
+                file: file,
+                line: line
+            )
+        case .incorrectOrder:
+            XCTFail(
+                "Ожидания не были выполнены в требуемом порядке",
+                file: file,
+                line: line
+            )
+        case .invertedFulfillment:
+            XCTFail("Было выполнено инвертированное ожидание")
+        case .completed:
+            break
+        default:
+            break
+        }
+    }
+
+    private func makeWaitExpectation(event: ElementEvent) -> XCTNSPredicateExpectation {
+        let predicate = NSPredicate(format: event.rawValue)
+        return XCTNSPredicateExpectation(predicate: predicate, object: self)
+    }
+}
diff --git a/SwiftRadioUITests/Extensions/XCUIElementExtensions.swift b/SwiftRadioUITests/Extensions/XCUIElementExtensions.swift
deleted file mode 100644
index 797fa52..0000000
--- a/SwiftRadioUITests/Extensions/XCUIElementExtensions.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//  XCUIElementExtensions.swift
-//  SwiftRadioUITests
-//
-//  Created by Борис Лысиков on 19.09.2020.
-//  Copyright © 2020 matthewfecher.com. All rights reserved.
-//
-
-import XCTest
-
-extension XCUIElement {
-        
-    func tapElement() {
-        checkExistence()
-        self.tap()
-    }
-    
-    func checkExistence(_ isExists:Bool = true) {
-        XCTAssertEqual(isExists, self.waitForExistence(timeout: 2), "Element exist should be \(isExists) but now is \(self.exists)")
-    }
-                
-    func checkLabelEqualToString(_ checkValue: String) {
-        self.checkExistence()
-        
-        XCTAssertEqual(
-            self.label,
-            checkValue,
-            "\(String(describing: self.value)) isn't match \(checkValue)"
-        )
-    }
-    
-    func checkLabelContainsString(_ checkValue: String) {
-        self.checkExistence()
-        
-        XCTAssertTrue(
-            self.label.contains(checkValue),
-            "\(String(describing: self.value)) not contains \(checkValue)"
-        )
-    }
-    
-    func checkValueEqualToString(_ checkValue: String) {
-        self.checkExistence()
-
-        XCTAssertEqual(
-            self.value as! String,
-            checkValue,
-            "\(String(describing: self.value)) isn't match \(checkValue)"
-        )
-    }
-    
-}
diff --git a/SwiftRadioUITests/Page/AnotherApp/SafariPage.swift b/SwiftRadioUITests/Page/AnotherApp/SafariPage.swift
new file mode 100644
index 0000000..2b4c897
--- /dev/null
+++ b/SwiftRadioUITests/Page/AnotherApp/SafariPage.swift
@@ -0,0 +1,12 @@
+//
+//  SafariPage.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+struct SafariPage: BaseScreen {
+    static let alertOpenButton = safari.otherElements["SFDialogView"].buttons.element(boundBy: 1)
+    static let url = safari.textFields.firstMatch
+}
diff --git a/SwiftRadioUITests/Page/AppInfoPage.swift b/SwiftRadioUITests/Page/AppInfoPage.swift
index a1a02cc..0133b34 100644
--- a/SwiftRadioUITests/Page/AppInfoPage.swift
+++ b/SwiftRadioUITests/Page/AppInfoPage.swift
@@ -8,75 +8,11 @@
 
 import XCTest
 
-final class AppInfoPage: CommonPage {
-    
-    // MARK: - UI elements and variables
-    
-    private lazy var closeButton: XCUIElement = {
-        app.buttons["closeButton"]
-    }()
-    
-    private lazy var swiftImage: XCUIElement = {
-        app.images["swiftImage"]
-    }()
-    
-    private lazy var aboutButton: XCUIElement = {
-        app.buttons["aboutButton"]
-    }()
-    
-    private lazy var websiteButton: XCUIElement = {
-        app.buttons["websiteButton"]
-    }()
-    
-    private lazy var openSourceLabel: XCUIElement = {
-        app.staticTexts["openSourceLabel"]
-    }()
-    
-    private lazy var authorsLabel: XCUIElement = {
-        app.staticTexts["authorsLabel"]
-    }()
-    
-    private let openSourceText = "Open Source Project"
-    private let authorsText = "Matt Fecher & Fethi El Hassasna"
-    
-    // MARK: -  Actions
-    
-    @discardableResult
-    func closeInfoPage() -> Self {
-        closeButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func openWebsite() -> Self {
-        websiteButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func openAbout() -> Self {
-        aboutButton.tapElement()
-        return self
-    }
-    
-    // MARK: -  Verification
-    
-    @discardableResult
-    func checkAuthors() -> Self {
-        authorsLabel.checkLabelEqualToString(authorsText)
-        return self
-    }
-    
-    @discardableResult
-    func checkOpenSource() -> Self {
-        openSourceLabel.checkLabelEqualToString(openSourceText)
-        return self
-    }
-    
-    @discardableResult
-    func checkImage() -> Self {
-        swiftImage.checkExistence()
-        return self
-    }
-    
+struct AppInfoPage: BaseScreen {
+    static let closeButton = app.buttons["closeButton"]
+    static let swiftImage = app.images["swiftImage"]
+    static let aboutButton = app.buttons["aboutButton"]
+    static let websiteButton = app.buttons["websiteButton"]
+    static let openSourceLabel = app.staticTexts["openSourceLabel"]
+    static let authorsLabel = app.staticTexts["authorsLabel"]
 }
diff --git a/SwiftRadioUITests/Page/BaseScreenProtocol.swift b/SwiftRadioUITests/Page/BaseScreenProtocol.swift
new file mode 100644
index 0000000..cf7f2ce
--- /dev/null
+++ b/SwiftRadioUITests/Page/BaseScreenProtocol.swift
@@ -0,0 +1,59 @@
+//
+//  BaseScreenProtocol.swift
+//  SwiftRadioUITests
+//
+//  Created by Lysikov Boris on 22.10.2024.
+//  Copyright © 2024 matthewfecher.com. All rights reserved.
+//
+
+import XCTest
+
+protocol BaseScreen {
+    static var app: XCUIApplication { get }
+    static var safari: XCUIApplication { get }
+}
+
+protocol NavigationBar: BaseScreen {
+    static var navigationBarBackButton: XCUIElement { get }
+    static var navigationBarTitle: XCUIElement { get }
+}
+
+protocol Alert: BaseScreen {
+    static var alertTitle: XCUIElement { get }
+    static var alertDescription: XCUIElement { get }
+    static var alertButton: XCUIElement { get }
+}
+
+extension BaseScreen {
+    static var app: XCUIApplication {
+        XCUIApplication()
+    }
+
+    static var safari: XCUIApplication {
+        XCUIApplication(bundleIdentifier: BundleId.safari.rawValue)
+    }
+}
+
+extension NavigationBar {
+    static var navigationBarTitle: XCUIElement {
+        app.navigationBars.staticTexts.firstMatch
+    }
+    
+    static var navigationBarBackButton: XCUIElement {
+        app.navigationBars.children(matching: .button).firstMatch
+    }
+}
+
+extension Alert {
+    static var alertTitle: XCUIElement {
+        app.alerts.staticTexts.firstMatch
+    }
+    
+    static var alertDescription: XCUIElement {
+        app.alerts.staticTexts.element(boundBy: 1).firstMatch
+    }
+    
+    static var alertButton: XCUIElement {
+        app.alerts.buttons.firstMatch
+    }
+}
diff --git a/SwiftRadioUITests/Page/CommonPage.swift b/SwiftRadioUITests/Page/CommonPage.swift
index dc66dfe..d937d25 100644
--- a/SwiftRadioUITests/Page/CommonPage.swift
+++ b/SwiftRadioUITests/Page/CommonPage.swift
@@ -31,30 +31,30 @@ class CommonPage {
     
     // MARK: -  Actions
     
-    @discardableResult
-    func tapOnBackButton() -> Self {
-        backButton.tapElement()
-        return self
-    }
+//    @discardableResult
+//    func tapOnBackButton() -> Self {
+//        backButton.tapElement()
+//        return self
+//    }
     
     // MARK: -  Verification
     
-    @discardableResult
-    func checkLabelInBackButton(text: String) -> Self {
-        backButton.checkLabelEqualToString(text)
-        return self
-    }
-    
-    @discardableResult
-    func checkNavbarTitleOnMainPage() -> Self {
-        nameOfMainPageNavbarTitle.checkLabelEqualToString(nameOfMainPageNavbarText)
-        return self
-    }
-    
-    @discardableResult
-    func checkMainDomain(domain: String) -> Self {
-        XCTAssertTrue((URL.firstMatch.value as! String).contains(domain), "\(domain) not found")
-        return self
-    }
+//    @discardableResult
+//    func checkLabelInBackButton(text: String) -> Self {
+//        backButton.checkLabelEqualToString(text)
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkNavbarTitleOnMainPage() -> Self {
+//        nameOfMainPageNavbarTitle.checkLabelEqualToString(nameOfMainPageNavbarText)
+//        return self
+//    }
+    
+//    @discardableResult
+//    func checkMainDomain(domain: String) -> Self {
+//        XCTAssertTrue((URL.firstMatch.value as! String).contains(domain), "\(domain) not found")
+//        return self
+//    }
     
 }
diff --git a/SwiftRadioUITests/Page/MainPage.swift b/SwiftRadioUITests/Page/MainPage.swift
index e9582ba..5c486f1 100644
--- a/SwiftRadioUITests/Page/MainPage.swift
+++ b/SwiftRadioUITests/Page/MainPage.swift
@@ -8,104 +8,22 @@
 
 import XCTest
 
-final class MainPage: CommonPage {
+struct MainPage: BaseScreen, NavigationBar {
+    static private let stationCell = "stationCell"
     
-    // MARK: - UI elements and variables
-    
-    private let stationName = "stationName"
-    private let stationCell = "stationCell"
-    private let stationDesc = "stationDesc"
-    private let stationImage = "stationImage"
-    
-    private lazy var infoNavbarButton: XCUIElement = {
-        app.navigationBars.children(matching: .button).firstMatch
-    }()
-    
-    private lazy var nowPlayingNavbarButton: XCUIElement = {
-        app.navigationBars.children(matching: .button).element(boundBy: 1)
-    }()
-    
-    private lazy var playbutton: XCUIElement = {
-        app.buttons["nowPlayingButton"]
-    }()
-        
-    // MARK: -  Actions
-    
-    @discardableResult
-    func tapOnStation(index: Int) -> Self {
-        app.cells.matching(identifier: stationCell).element(boundBy: index).tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnPlayButton() -> Self {
-        playbutton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnInfoButton() -> Self {
-        infoNavbarButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnNowPlayingButton() -> Self {
-        nowPlayingNavbarButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func nowPlayingButtonIsExist(isExist: Bool) -> Self {
-        nowPlayingNavbarButton.checkExistence(isExist)
-        return self
-    }
-    
-    @discardableResult
-    func getStationName(indexOfStation: Int) -> String {
-        app.cells.matching(identifier: stationCell).element(boundBy: indexOfStation).staticTexts[stationName].firstMatch.label
-    }
-    
-    @discardableResult
-    func getStationDesk(indexOfStation: Int) -> String {
-        app.cells.matching(identifier: stationCell).element(boundBy: indexOfStation).staticTexts[stationDesc].firstMatch.label
-    }
-    
-    @discardableResult
-    func getStationImage(indexOfStation: Int) -> XCUIElement {
-        app.cells.matching(identifier: stationCell).element(boundBy: indexOfStation).images[stationImage].firstMatch
-    }
-    
-    // MARK: -  Verification
-    
-    @discardableResult
-    func checkTextInPlayingButton(text: String) -> Self {
-        playbutton.checkLabelEqualToString(text)
-        return self
-    }
-    
-    @discardableResult
-    func checkStationName(indexOfStation: Int, stationName: String) -> Self {
-        XCTAssertEqual(getStationName(indexOfStation: indexOfStation), stationName, "\(getStationName(indexOfStation: indexOfStation)) isn't match \(stationName)")
-        return self
+    static let nowPlayingNavbarButton = app.navigationBars.children(matching: .button).element(boundBy: 1)
+    static let playbutton = app.buttons["nowPlayingButton"]
+            
+    static func getStation(index: Int) -> XCUIElement {
+        app.cells.matching(identifier: stationCell).element(boundBy: index)
     }
     
-    @discardableResult
-    func checkStationDesc(indexOfStation: Int, stationDesk: String) -> Self {
-        XCTAssertEqual(getStationDesk(indexOfStation: indexOfStation), stationDesk, "\(getStationDesk(indexOfStation: indexOfStation)) isn't match \(stationDesk)")
-        return self
+    static func getStationName(index: Int) -> String {
+        app.cells.matching(identifier: stationCell).element(boundBy: index).staticTexts["stationName"].firstMatch.label
     }
     
-    @discardableResult
-    func checkPlayButton(text: String) -> Self {
-        playbutton.checkLabelContainsString(text)
-        return self
+    static func getStationDescription(index: Int) -> String {
+        app.cells.matching(identifier: stationCell).element(boundBy: index).staticTexts["stationDesc"].firstMatch.label
     }
     
-    @discardableResult
-    func checkStationImage(indexOfStation: Int) -> Self {
-        getStationImage(indexOfStation: indexOfStation).checkExistence()
-        return self
-    }
-            
 }
diff --git a/SwiftRadioUITests/Page/RadioInfoPage.swift b/SwiftRadioUITests/Page/RadioInfoPage.swift
index e01eae6..c9b1301 100644
--- a/SwiftRadioUITests/Page/RadioInfoPage.swift
+++ b/SwiftRadioUITests/Page/RadioInfoPage.swift
@@ -8,86 +8,15 @@
 
 import XCTest
 
-final class RadioInfoPage: CommonPage {
-    
-    // MARK: - UI elements and variables
-        
-    private lazy var logoImage: XCUIElement = {
-        app.images["logoImage"]
-    }()
-    
-    private lazy var versionLabel: XCUIElement = {
-        app.staticTexts["versionLabel"]
-    }()
-    
-    private lazy var nameOfAppLabel: XCUIElement = {
-        app.staticTexts["nameOfAppLabel"]
-    }()
-    
-    private lazy var linkButton: XCUIElement = {
-        app.buttons["linkButton"]
-    }()
-    
-    private lazy var emailButton: XCUIElement = {
-        app.buttons["emailButton"]
-    }()
-    
-    private lazy var okayButton: XCUIElement = {
-        app.buttons["okayButton"]
-    }()
-    
-    private lazy var textView: XCUIElement = {
-        app.textViews["textView"]
-    }()
-    
-    private let versionText = "Xcode 9 / Swift 4"
-    private let nameOfAppText = "Radio App"
-    private let textViewText = "FEATURES:
+ Displays Artist, Track and Album/Station Art on lock screen.\n+ Background Audio performance\n+iTunes API integration to automatically download album art\n+ Loads and parses Icecast metadata (i.e. artist & track names)\n+ Ability to update stations from server without resubmitting to the app store.\n"
-    
-    // MARK: -  Actions
-    
-    @discardableResult
-    func tapOnOkay() -> Self {
-        okayButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnLink() -> Self {
-        linkButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnEmailMe() -> Self {
-        emailButton.tapElement()
-        return self
-    }
-    
-    // MARK: -  Verification
-    
-    @discardableResult
-    func checkLogo() -> Self {
-        logoImage.checkExistence()
-        return self
-    }
-    
-    @discardableResult
-    func checkVersion() -> Self {
-        versionLabel.checkLabelEqualToString(versionText)
-        return self
-    }
-    
-    @discardableResult
-    func checkNameOfApp() -> Self {
-        nameOfAppLabel.checkLabelEqualToString(nameOfAppText)
-        return self
-    }
-    
-    @discardableResult
-    func checkTextView() -> Self {
-        textView.checkValueEqualToString(textViewText)
-        return self
-    }
-    
+struct RadioInfoPage: BaseScreen, Alert {
+    static let versionText = "Xcode 9 / Swift 4"
+    static let textViewText = "FEATURES:
+ Displays Artist, Track and Album/Station Art on lock screen.\n+ Background Audio performance\n+iTunes API integration to automatically download album art\n+ Loads and parses Icecast metadata (i.e. artist & track names)\n+ Ability to update stations from server without resubmitting to the app store.\n"
+    
+    static let logoImage = app.images["logoImage"]
+    static let versionLabel = app.staticTexts["versionLabel"]
+    static let nameOfAppLabel = app.staticTexts["nameOfAppLabel"]
+    static let linkButton = app.buttons["linkButton"]
+    static let emailButton = app.buttons["emailButton"]
+    static let okayButton = app.buttons["okayButton"]
+    static let textView = app.textViews["textView"]
 }
diff --git a/SwiftRadioUITests/Page/StationDetailsPage.swift b/SwiftRadioUITests/Page/StationDetailsPage.swift
index 122f44c..d85dbe9 100644
--- a/SwiftRadioUITests/Page/StationDetailsPage.swift
+++ b/SwiftRadioUITests/Page/StationDetailsPage.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 
-final class StationDetailsPage: CommonPage {
+struct StationDetailsPage: BaseScreen, NavigationBar {
     
     // MARK: - UI elements and variables
     
@@ -17,122 +17,79 @@ final class StationDetailsPage: CommonPage {
         case stopped = "Station Stopped"
         case error = "Error Playing"
     }
-        
-    private lazy var albumArtImage: XCUIElement = {
-        app.images["albumArtImage"]
-    }()
-    
-    private lazy var stationDeskLabel: XCUIElement = {
-        app.staticTexts["stationDeskLabel"]
-    }()
-    
-    private lazy var playButton: XCUIElement = {
-        app.buttons["playButton"]
-    }()
-    
-    private lazy var stopButton: XCUIElement = {
-        app.buttons["stopButton"]
-    }()
-    
-    private lazy var previousButton: XCUIElement = {
-        app.buttons["previousButton"]
-    }()
-    
-    private lazy var nextButton: XCUIElement = {
-        app.buttons["nextButton"]
-    }()
-    
-    private lazy var volumeSlider: XCUIElement = {
-        app.sliders["volumeSlider"]
-    }()
-    
-    private lazy var volumeMinImage: XCUIElement = {
-        app.images["volumeMinImage"]
-    }()
     
-    private lazy var volumeMaxImage: XCUIElement = {
-        app.images["volumeMaxImage"]
-    }()
-    private lazy var songLabel: XCUIElement = {
-        app.staticTexts["songLabel"]
-    }()
-    
-    private lazy var artistLabel: XCUIElement = {
-        app.staticTexts["artistLabel"]
-    }()
-    
-    private lazy var companyButton: XCUIElement = {
-        app.buttons["companyButton"]
-    }()
-    
-    private lazy var shareButton: XCUIElement = {
-        app.buttons["shareButton"]
-    }()
-    
-    private lazy var infoButton: XCUIElement = {
-        app.buttons["infoButton"]
-    }()
-    
-    private lazy var airPlayView: XCUIElement = {
-        app.otherElements["airPlayView"]
-    }()
+    static let albumArtImage = app.images["albumArtImage"]
+    static let stationDeskLabel = app.staticTexts["stationDeskLabel"]
+    static let playButton = app.buttons["playButton"]
+    static let stopButton = app.buttons["stopButton"]
+    static let previousButton = app.buttons["previousButton"]
+    static let nextButton = app.buttons["nextButton"]
+    static let volumeSlider = app.sliders["volumeSlider"]
+    static let volumeMinImage = app.images["volumeMinImage"]
+    static let volumeMaxImage = app.images["volumeMaxImage"]
+    static let songLabel = app.staticTexts["songLabel"]
+    static let artistLabel = app.staticTexts["artistLabel"]
+    static let companyButton = app.buttons["companyButton"]
+    static let shareButton = app.buttons["shareButton"]
+    static let infoButton = app.buttons["infoButton"]
+    static let airPlayView = app.otherElements["airPlayView"]
     
     // MARK: -  Actions
         
-    @discardableResult
-    func tapOnPlay() -> Self {
-        playButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnStop() -> Self {
-//      баг с стороны программы, если быстро нажать на стоп трек не стопорится
-        stopButton.waitForExistence(timeout: 2)
-        stopButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnInfoButton() -> Self {
-        infoButton.tapElement()
-        return self
-    }
-    
-    @discardableResult
-    func tapOnCompanyButton() -> Self {
-        companyButton.tapElement()
-        return self
-    }
-    
-    // MARK: -  Verification
-    
-    @discardableResult
-    func checkSongPauseLabel() -> Self {
-        songLabel.checkLabelContainsString(PlayingStatus.pause.rawValue)
-        return self
-    }
-    
-    @discardableResult
-    func checkSongStoppedLabel() -> Self {
-        songLabel.checkLabelContainsString(PlayingStatus.stopped.rawValue)
-        return self
-    }
-    
-    @discardableResult
-    func checkSongErrorLabel() -> Self {
-        songLabel.checkLabelContainsString(PlayingStatus.error.rawValue)
-        return self
-    }
-    
-    @discardableResult
-    func checkNavbarTitle(stationName: String) -> Self {
-        let navbarTitle: XCUIElement = {
-            app.navigationBars[stationName].otherElements[stationName]
-        }()
-        
-        navbarTitle.checkLabelEqualToString(stationName)
-        return self
-    }
+//    @discardableResult
+//    func tapOnPlay() -> Self {
+//        playButton.tapElement()
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func tapOnStop() -> Self {
+////      баг с стороны программы, если быстро нажать на стоп трек не стопорится
+//        stopButton.waitForExistence(timeout: 2)
+//        stopButton.tapElement()
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func tapOnInfoButton() -> Self {
+//        infoButton.tapElement()
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func tapOnCompanyButton() -> Self {
+//        companyButton.tapElement()
+//        return self
+//    }
+//    
+//    // MARK: -  Verification
+//    
+//    @discardableResult
+//    func checkSongPauseLabel() -> Self {
+//        songLabel.checkLabelContainsString(PlayingStatus.pause.rawValue)
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkSongStoppedLabel() -> Self {
+//        songLabel.checkLabelContainsString(PlayingStatus.stopped.rawValue)
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkSongErrorLabel() -> Self {
+//        songLabel.checkLabelContainsString(PlayingStatus.error.rawValue)
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkNavbarTitle(stationName: String) -> Self {
+//        let navbarTitle: XCUIElement = {
+//            app.navigationBars[stationName].otherElements[stationName]
+//        }()
+//        
+//        navbarTitle.checkLabelEqualToString(stationName)
+//        return self
+//    }
     
 }
diff --git a/SwiftRadioUITests/Page/StationInfoPage.swift b/SwiftRadioUITests/Page/StationInfoPage.swift
index f4f8df0..848b532 100644
--- a/SwiftRadioUITests/Page/StationInfoPage.swift
+++ b/SwiftRadioUITests/Page/StationInfoPage.swift
@@ -8,64 +8,50 @@
 
 import XCTest
 
-final class StationInfoPage: CommonPage {
+struct StationInfoPage: BaseScreen {
     
-    // MARK: - UI elements and variables
-    
-    private lazy var stationImage: XCUIElement = {
-        app.images["stationImage"]
-    }()
-    
-    private lazy var okayButton: XCUIElement = {
-        app.buttons["okayButton"]
-    }()
+    static let stationImage = app.images["stationImage"]
+    static let stationNameLabel = app.staticTexts["stationNameLabel"]
+    static let okayButton = app.buttons["okayButton"]
+    static let stationDeskLabel = app.staticTexts["stationDeskLabel"]
+    static let stationTextView = app.textViews["stationTextView"]
     
-    private lazy var stationNameLabel: XCUIElement = {
-        app.staticTexts["stationNameLabel"]
-    }()
-    
-    private lazy var stationDeskLabel: XCUIElement = {
-        app.staticTexts["stationDeskLabel"]
-    }()
-    
-    private lazy var stationTextView: XCUIElement = {
-        app.textViews["stationTextView"]
-    }()
+    // MARK: - UI elements and variables
     
     private let stationDescDescription = "The Music Starts Here"
     private let textViewDescription = "All your favorite country hits and artists, from Johnny Cash to Taylor Swift, on 1.FM's Absolute Country, playing non-stop crooners and banjos, dance-tunes and fiddles, ballads and harmonicas. Absolute Country focuses on 5th, 6th and 7th generation Country (from the 90s on) but often delves into classic, older tunes as well."
     
     // MARK: -  Actions
-    
-    @discardableResult
-    func tapOnOkay() -> Self {
-        okayButton.tapElement()
-        return self
-    }
-    
-    // MARK: -  Verification
-    
-    @discardableResult
-    func checkTextInNavbarButton(stationName: String) -> Self {
-        return self
-    }
-    
-    @discardableResult
-    func checkStationImage() -> Self {
-        stationImage.checkExistence(true)
-        return self
-    }
-    
-    @discardableResult
-    func checkStationNameLabel(stationName: String) -> Self {
-        stationNameLabel.checkLabelEqualToString(stationName)
-        return self
-    }
-    
-    @discardableResult
-    func checkStationDeskLabel() -> Self {
-        stationDeskLabel.checkLabelEqualToString(stationDescDescription)
-        return self
-    }
+//    
+//    @discardableResult
+//    func tapOnOkay() -> Self {
+//        okayButton.tapElement()
+//        return self
+//    }
+//    
+//    // MARK: -  Verification
+//    
+//    @discardableResult
+//    func checkTextInNavbarButton(stationName: String) -> Self {
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkStationImage() -> Self {
+//        stationImage.checkExistence(true)
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkStationNameLabel(stationName: String) -> Self {
+//        stationNameLabel.checkLabelEqualToString(stationName)
+//        return self
+//    }
+//    
+//    @discardableResult
+//    func checkStationDeskLabel() -> Self {
+//        stationDeskLabel.checkLabelEqualToString(stationDescDescription)
+//        return self
+//    }
     
 }
diff --git a/SwiftRadioUITests/Tests/AppInfoTest.swift b/SwiftRadioUITests/Tests/AppInfoTest.swift
index a119aac..754d822 100644
--- a/SwiftRadioUITests/Tests/AppInfoTest.swift
+++ b/SwiftRadioUITests/Tests/AppInfoTest.swift
@@ -8,49 +8,76 @@
 
 final class AppInfoTest: CommonTest {
     
-    private let mainPage = MainPage()
-    private let appInfoPage = AppInfoPage()
-    private let radioInfoPage = RadioInfoPage()
-    
     /*
      Проверка отображения элементов на экране и переход на корректную ссылку при нажатии на кнопку "Website"
      */
     func testOpenWebsiteFromAppInfo() {
-        mainPage
-            .tapOnInfoButton()
-        appInfoPage
-            .checkAuthors()
-            .checkAuthors()
-            .checkImage()
-            .openWebsite()
-            .checkMainDomain(domain: "github.com")
+        let openSourceText = "Open Source Project"
+        let authorsText = "Matt Fecher & Fethi El Hassasna"
+        
+        step("Нажать на кнопку инфо") {
+            MainPage.navigationBarBackButton.tapElement()
+            
+            step("Проверить Автора") {
+                AppInfoPage.authorsLabel.verifyLabel(equal: authorsText)
+            }
+            step("Проверить наличие картиники") {
+                AppInfoPage.swiftImage.verifyElement()
+            }
+        }
+        step("Открыть веб сайт") {
+            AppInfoPage.websiteButton.tapElement()
+            
+            step("Проверить корректный домен") {
+                SafariPage.url.verifyText(equal: "github.com")
+            }
+        }
     }
     
-    /*
-     Проверка перехода в экран о радио через текущий экран по нажатию на кнопку "About и перехода обратно"
-     */
+//    /*
+//     Проверка перехода в экран о радио через текущий экран по нажатию на кнопку "About и перехода обратно"
+//     */
     func testOpenAboutFromAppInfo() {
-        mainPage
-            .tapOnInfoButton()
-        appInfoPage
-            .openAbout()
-        radioInfoPage
-            .checkNameOfApp()
-            .tapOnOkay()
-        appInfoPage
-            .checkAuthors()
-    }
-    
-    /*
-     Проверка корректного закрытия текущего экрана
-     */
-    func testCloseAboutAppPage() {
-        mainPage
-            .tapOnInfoButton()
-        appInfoPage
-            .closeInfoPage()
-        mainPage
-            .checkNavbarTitleOnMainPage()
+        let nameOfAppText = "Radio App"
+        
+        step("Нажать на кнопку инфо") {
+            MainPage.navigationBarBackButton.tapElement()
+        }
+        step("Нажать на кнопку About") {
+            AppInfoPage.aboutButton.tapElement()
+            
+            step("Проверить имя приложения") {
+                RadioInfoPage.nameOfAppLabel.verifyLabel(equal: nameOfAppText)
+            }
+//            step("") {
+//                <#code#>
+//            }
+        }
+
+        
+        
+//        mainPage
+//            .tapOnInfoButton()
+//        appInfoPage
+//            .openAbout()
+//        radioInfoPage
+//            .checkNameOfApp()
+//            .tapOnOkay()
+//        appInfoPage
+//            .checkAuthors()
     }
+//    
+//    /*
+//     Проверка корректного закрытия текущего экрана
+//     */
+//    func testCloseAboutAppPage() {
+//        mainPage
+//            .tapOnInfoButton()
+//        
+//        AppInfoPage.closeButton.tapElement()
+//        
+//        mainPage
+//            .checkNavbarTitleOnMainPage()
+//    }
 
 }
diff --git a/SwiftRadioUITests/Tests/CommonTest.swift b/SwiftRadioUITests/Tests/CommonTest.swift
index 6b2a06d..d26207d 100644
--- a/SwiftRadioUITests/Tests/CommonTest.swift
+++ b/SwiftRadioUITests/Tests/CommonTest.swift
@@ -9,16 +9,12 @@
 import XCTest
 
 class CommonTest: XCTestCase {
-    
-    let app = XCUIApplication()
-    let safari = XCUIApplication(bundleIdentifier: "com.apple.mobilesafari")
-    
+        
     override func setUp() {
         super.setUp()
         
         continueAfterFailure = false
         XCUIApplication().launch()
-        
     }
     
     override class func tearDown() {
diff --git a/SwiftRadioUITests/Tests/RadioInfoTest.swift b/SwiftRadioUITests/Tests/RadioInfoTest.swift
index de7f58c..ac55b4c 100644
--- a/SwiftRadioUITests/Tests/RadioInfoTest.swift
+++ b/SwiftRadioUITests/Tests/RadioInfoTest.swift
@@ -5,61 +5,89 @@
 //  Created by Борис Лысиков on 20.09.2020.
 //  Copyright © 2020 matthewfecher.com. All rights reserved.
 //
+import Foundation
 
 final class RadioInfoTest: CommonTest {
-    
-    private let mainPage = MainPage()
-    private let stationDetailsPage = StationDetailsPage()
-    private let radioInfoPage = RadioInfoPage()
         
     /*
      Проверка отображения элементов на экране и переход на корректную ссылку при нажатии на кнопку "matthewfetcher.com"
      */
     func testOpenWebLink() {
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnCompanyButton()
-        radioInfoPage
-            .checkLogo()
-            .checkNameOfApp()
-            .checkTextView()
-            .checkVersion()
-            .tapOnLink()
-            .checkMainDomain(domain: "matthewfecher.com")
+        let versionText = "Xcode 9 / Swift 4"
+        let nameOfAppText = "Radio App"
+        let textViewText = "FEATURES:
+ Displays Artist, Track and Album/Station Art on lock screen.\n+ Background Audio performance\n+iTunes API integration to automatically download album art\n+ Loads and parses Icecast metadata (i.e. artist & track names)\n+ Ability to update stations from server without resubmitting to the app store.\n"
+        
+        step("Открыть первую станцию") {
+            MainPage.getStation(index: 0).tapElement()
+        }
+        step("Открыть страницу компании") {
+            StationDetailsPage.companyButton.tapElement()
+            
+            step("Проверить отображение лого") {
+                RadioInfoPage.logoImage.verifyElement()
+            }
+            step("Проверить отображение названия приложения") {
+                RadioInfoPage.nameOfAppLabel.verifyLabel(equal: nameOfAppText)
+            }
+            step("Проверить текст на странице") {
+                RadioInfoPage.textView.verifyText(equal: textViewText)
+            }
+            step("Проверить версию приложения") {
+                RadioInfoPage.versionLabel.verifyLabel(equal: versionText)
+            }
+        }
+        step("Нажать на линку") {
+            RadioInfoPage.linkButton.tapElement()
+            
+            step("Отображается корректный домен") {
+                SafariPage.url.verifyText(equal: "matthewfecher.com")
+            }
+        }
     }
     
     /*
-     Проверка отображения алертов при нажатии на кнопку email
+     Проверка отображения алерта при нажатии на кнопку email
      */
     func testOpemEmailMeIfWeDontHaveEmail() {
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnCompanyButton()
-        radioInfoPage
-            .tapOnEmailMe()
-        
-        acceptNoMailAlert()
-        acceptNoSendEMailAlert()
-        
-        radioInfoPage
-            .checkVersion()
+        step("Открыть первую станцию") {
+            MainPage.getStation(index: 0).tapElement()
+        }
+        step("Открыть страницу компании") {
+            StationDetailsPage.companyButton.tapElement()
+        }
+        step("Нажать кнопку email") {
+            RadioInfoPage.emailButton.tapElement()
+            
+            step("Проверить заголовок алерта") {
+                RadioInfoPage.alertTitle.verifyLabel(equal: "Could Not Send Email")
+            }
+            step("Проверить описание алерта") {
+                RadioInfoPage.alertDescription.verifyLabel(equal: "Your device could not send e-mail.  Please check e-mail configuration and try again.")
+            }
+        }
+        step("Закрыть алерт") {
+            RadioInfoPage.alertButton.tapElement()
+        }
     }
     
     /*
      Проверка корректного закрытия текущего экрана
      */
     func testClosePage() {
-        let nameOfStation = mainPage.getStationName(indexOfStation: 0)
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnCompanyButton()
-        radioInfoPage
-            .tapOnOkay()
-        stationDetailsPage
-            .checkNavbarTitle(stationName: nameOfStation)
+        let nameOfStation = MainPage.getStationName(index: 0)
+        
+        step("Открыть первую станцию") {
+            MainPage.getStation(index: 0).tapElement()
+        }
+        step("Открыть страницу компании") {
+            StationDetailsPage.companyButton.tapElement()
+        }
+        step("Нажать кнопку окей") {
+            RadioInfoPage.okayButton.tapElement()
+        }
+        step("Проверить название станции в навигационной панели") {
+            StationDetailsPage.navigationBarTitle.verifyLabel(equal: nameOfStation)
+        }
     }
 
 }
diff --git a/SwiftRadioUITests/Tests/SmokeTest.swift b/SwiftRadioUITests/Tests/SmokeTest.swift
index 37ddded..7bf900d 100644
--- a/SwiftRadioUITests/Tests/SmokeTest.swift
+++ b/SwiftRadioUITests/Tests/SmokeTest.swift
@@ -7,110 +7,115 @@
 //
 
 final class SmokeTest: CommonTest {
-    
-    private let mainPage = MainPage()
-    private let stationDetailsPage = StationDetailsPage()
-    private let stationInfoPage = StationInfoPage()
-    private let appInfoPage = AppInfoPage()
-    private let radioInfoPage = RadioInfoPage()
-    
+        
     /*
      Проверка правильного отображения кнопки "Now Playing" в Navigation bar
      */
     func testDisplayNowPlayingButton() {
-        mainPage
-            .nowPlayingButtonIsExist(isExist: false)
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnBackButton()
-        mainPage
-            .nowPlayingButtonIsExist(isExist: true)
+        step("Проверить что при старте приложения кнопка play не отображается") {
+            MainPage.playbutton.verifyElement(event: .disabled)
+        }
+        step("Открыть первую станцию") {
+            MainPage.getStation(index: 0).tapElement()
+        }
+        step("Нажать кнопку назад") {
+            StationDetailsPage.navigationBarBackButton.tapElement()
+        }
+        step("Проверить что кнопка play отображается") {
+            MainPage.playbutton.verifyElement()
+        }
     }
     
     /*
-     Провекра отображения выбранной станции в кнопке Play
+     Проверка отображения выбранной станции в кнопке Play
      */
     func testDisplaySelectedStationInPlayButton() {
-        let nameOfStation = mainPage.getStationName(indexOfStation: 0)
-        mainPage
-            .checkPlayButton(text: "Choose a station above to begin")
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnBackButton()
-        mainPage
-            .checkPlayButton(text: nameOfStation)
-    }
-    
-    /*
-     Проверка отображения всех элементов в ячейке
-     */
-    func testElementExistOnScreen() {
-        mainPage
-        .checkStationName(indexOfStation: 0, stationName: "Absolute Country Hits")
-        .checkStationDesc(indexOfStation: 0, stationDesk: "The Music Starts Here")
-        .checkStationImage(indexOfStation: 0)
-    }
-    
-    /*
-     Проверка статуса - пауза для трека с радио
-     */
-    func testPauseStation() {
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnPlay()
-            .checkSongPauseLabel()
-    }
-    
-    /*
-     Проверка статуса - стоп для трека с радио
-     */
-    func testStopStation() {
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnStop()
-            .checkSongStoppedLabel()
-    }
-    
-    /*
-     Проверка статуса - ошибка для трека с радио
-     */
-    func testErrorStatusForSong() {
-        mainPage
-            .tapOnStation(index: 1)
-        stationDetailsPage
-            .checkSongErrorLabel()
-    }
-    
-    /*
-     Проверка открытия правильной станции по нажатию на кнопку "Now Playing" в NavBar
-     */
-    func testOpenStationDetailsByTapOnNowPlayingButton() {
-        let nameOfStation = mainPage.getStationName(indexOfStation: 0)
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnBackButton()
-        mainPage
-            .tapOnNowPlayingButton()
-        stationDetailsPage
-            .checkNavbarTitle(stationName: nameOfStation)
-    }
-    
-    /*
-     Проверка открытия правильной станции по нажатию на кнопку "Play"
-     */
-    func testOpenStationDetailsByTapOnPlayingButton() {
-        let nameOfStation = mainPage.getStationName(indexOfStation: 1)
-        mainPage
-            .tapOnStation(index: 1)
-        stationDetailsPage
-            .tapOnBackButton()
-        mainPage
-            .tapOnPlayButton()
-        stationDetailsPage
-            .checkNavbarTitle(stationName: nameOfStation)
+        let nameOfStation = MainPage.getStationName(index: 0)
+        
+        step("Проверить отображение текста в кнопке play") {
+            MainPage.playbutton.verifyLabel(equal: "Choose a station above to begin")
+        }
+        step("Открыть первую станцию") {
+            MainPage.getStation(index: 0).tapElement()
+        }
+        step("Нажать кнопку назад") {
+            StationDetailsPage.navigationBarBackButton.tapElement()
+        }
+        step("Проверить отображение станции в кнопке play ") {
+            MainPage.playbutton.verifyLabelContain(contain: nameOfStation)
+        }
     }
+//    
+//    /*
+//     Проверка отображения всех элементов в ячейке
+//     */
+//    func testElementExistOnScreen() {
+//        mainPage
+//        .checkStationName(indexOfStation: 0, stationName: "Absolute Country Hits")
+//        .checkStationDesc(indexOfStation: 0, stationDesk: "The Music Starts Here")
+//        .checkStationImage(indexOfStation: 0)
+//    }
+//    
+//    /*
+//     Проверка статуса - пауза для трека с радио
+//     */
+//    func testPauseStation() {
+//        mainPage
+//            .tapOnStation(index: 0)
+//        stationDetailsPage
+//            .tapOnPlay()
+//            .checkSongPauseLabel()
+//    }
+//    
+//    /*
+//     Проверка статуса - стоп для трека с радио
+//     */
+//    func testStopStation() {
+//        mainPage
+//            .tapOnStation(index: 0)
+//        stationDetailsPage
+//            .tapOnStop()
+//            .checkSongStoppedLabel()
+//    }
+//    
+//    /*
+//     Проверка статуса - ошибка для трека с радио
+//     */
+//    func testErrorStatusForSong() {
+//        mainPage
+//            .tapOnStation(index: 1)
+//        stationDetailsPage
+//            .checkSongErrorLabel()
+//    }
+//    
+//    /*
+//     Проверка открытия правильной станции по нажатию на кнопку "Now Playing" в NavBar
+//     */
+//    func testOpenStationDetailsByTapOnNowPlayingButton() {
+//        let nameOfStation = mainPage.getStationName(indexOfStation: 0)
+//        mainPage
+//            .tapOnStation(index: 0)
+//        stationDetailsPage
+//            .tapOnBackButton()
+//        mainPage
+//            .tapOnNowPlayingButton()
+//        stationDetailsPage
+//            .checkNavbarTitle(stationName: nameOfStation)
+//    }
+//    
+//    /*
+//     Проверка открытия правильной станции по нажатию на кнопку "Play"
+//     */
+//    func testOpenStationDetailsByTapOnPlayingButton() {
+//        let nameOfStation = mainPage.getStationName(indexOfStation: 1)
+//        mainPage
+//            .tapOnStation(index: 1)
+//        stationDetailsPage
+//            .tapOnBackButton()
+//        mainPage
+//            .tapOnPlayButton()
+//        stationDetailsPage
+//            .checkNavbarTitle(stationName: nameOfStation)
+//    }
             
 }
diff --git a/SwiftRadioUITests/Tests/StationInfoTest.swift b/SwiftRadioUITests/Tests/StationInfoTest.swift
index 7aa80f1..f016563 100644
--- a/SwiftRadioUITests/Tests/StationInfoTest.swift
+++ b/SwiftRadioUITests/Tests/StationInfoTest.swift
@@ -8,32 +8,28 @@
 
 final class StationInfoTest: CommonTest {
     
-    private let mainPage = MainPage()
-    private let stationDetailsPage = StationDetailsPage()
-    private let stationInfoPage = StationInfoPage()
-    
    /*
      Проверка отображение элементов на экране с информацией о станции, также корректную работу переходов по нажатию на кнопку назад(в Navigation bar) и ок на самом экране
      */
-    func testOpenStationDetailsByTapOnNowPlayingButton() {
-        let nameOfStation = mainPage.getStationName(indexOfStation: 0)
-        mainPage
-            .tapOnStation(index: 0)
-        stationDetailsPage
-            .tapOnInfoButton()
-        stationInfoPage
-            .checkStationNameLabel(stationName: nameOfStation)
-            .checkStationImage()
-            .checkStationDeskLabel()
-            .checkLabelInBackButton(text: nameOfStation)
-            .tapOnOkay()
-        stationDetailsPage
-            .checkNavbarTitle(stationName: nameOfStation)
-            .tapOnInfoButton()
-        stationInfoPage
-            .tapOnBackButton()
-        stationDetailsPage
-            .checkNavbarTitle(stationName: nameOfStation)
-    }
+//    func testOpenStationDetailsByTapOnNowPlayingButton() {
+//        let nameOfStation = mainPage.getStationName(indexOfStation: 0)
+//        mainPage
+//            .tapOnStation(index: 0)
+//        stationDetailsPage
+//            .tapOnInfoButton()
+//        stationInfoPage
+//            .checkStationNameLabel(stationName: nameOfStation)
+//            .checkStationImage()
+//            .checkStationDeskLabel()
+//            .checkLabelInBackButton(text: nameOfStation)
+//            .tapOnOkay()
+//        stationDetailsPage
+//            .checkNavbarTitle(stationName: nameOfStation)
+//            .tapOnInfoButton()
+//        stationInfoPage
+//            .tapOnBackButton()
+//        stationDetailsPage
+//            .checkNavbarTitle(stationName: nameOfStation)
+//    }
 
 }