diff --git a/src/main/java/WAB/PageObject/APPStartPage.java b/src/main/java/WAB/PageObject/APPStartPage.java
index f44daf0..6bb619a 100644
--- a/src/main/java/WAB/PageObject/APPStartPage.java
+++ b/src/main/java/WAB/PageObject/APPStartPage.java
@@ -36,6 +36,7 @@ public void performSearchByEnter(String request){
         searchByEnter(searchField);
     }
 
+    /*
     // Go to secondary Tabs Buttons
     @FindBy(css="[title=\"My Secondary WFs\"]") WebElement secondaryWFsButton;
     @FindBy(css="[title=\"New Workflow\"]") WebElement NewWFButton;
@@ -46,7 +47,7 @@ public void performSearchByEnter(String request){
     @FindBy(css = "[title=\"Print\"]") WebElement PrintButton;
     @FindBy(css = "[title=\"Designer\"]") WebElement DesignerButton ;
     @FindBy(css = "[title=\"Help\"]") WebElement HelpButton;
-
+    */
 
 
 
diff --git a/src/main/java/WAB/PageObject/DashBoardsTab.java b/src/main/java/WAB/PageObject/AppTabs/DashBoardsTab.java
similarity index 88%
rename from src/main/java/WAB/PageObject/DashBoardsTab.java
rename to src/main/java/WAB/PageObject/AppTabs/DashBoardsTab.java
index ffb5abc..8221c18 100644
--- a/src/main/java/WAB/PageObject/DashBoardsTab.java
+++ b/src/main/java/WAB/PageObject/AppTabs/DashBoardsTab.java
@@ -1,4 +1,4 @@
-package WAB.PageObject;
+package WAB.PageObject.AppTabs;
 
 import WAB.BasePage.BasePage;
 import org.openqa.selenium.WebDriver;
diff --git a/src/main/java/WAB/PageObject/DesignerTab.java b/src/main/java/WAB/PageObject/AppTabs/DesignerTab.java
similarity index 87%
rename from src/main/java/WAB/PageObject/DesignerTab.java
rename to src/main/java/WAB/PageObject/AppTabs/DesignerTab.java
index ae863b8..755f84e 100644
--- a/src/main/java/WAB/PageObject/DesignerTab.java
+++ b/src/main/java/WAB/PageObject/AppTabs/DesignerTab.java
@@ -1,4 +1,4 @@
-package WAB.PageObject;
+package WAB.PageObject.AppTabs;
 
 import WAB.BasePage.BasePage;
 import org.openqa.selenium.WebDriver;
diff --git a/src/main/java/WAB/PageObject/HelpTab.java b/src/main/java/WAB/PageObject/AppTabs/HelpTab.java
similarity index 87%
rename from src/main/java/WAB/PageObject/HelpTab.java
rename to src/main/java/WAB/PageObject/AppTabs/HelpTab.java
index 11eb31a..a9a28ba 100644
--- a/src/main/java/WAB/PageObject/HelpTab.java
+++ b/src/main/java/WAB/PageObject/AppTabs/HelpTab.java
@@ -1,4 +1,4 @@
-package WAB.PageObject;
+package WAB.PageObject.AppTabs;
 
 import WAB.BasePage.BasePage;
 import org.openqa.selenium.WebDriver;
diff --git a/src/main/java/WAB/PageObject/MetricsTab.java b/src/main/java/WAB/PageObject/AppTabs/MetricsTab.java
similarity index 56%
rename from src/main/java/WAB/PageObject/MetricsTab.java
rename to src/main/java/WAB/PageObject/AppTabs/MetricsTab.java
index 1d90849..6199b62 100644
--- a/src/main/java/WAB/PageObject/MetricsTab.java
+++ b/src/main/java/WAB/PageObject/AppTabs/MetricsTab.java
@@ -1,13 +1,23 @@
-package WAB.PageObject;
+package WAB.PageObject.AppTabs;
 
 import WAB.BasePage.BasePage;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
 
 /**
  * Created by yarish on 12/4/2015.
  */
 public class MetricsTab extends BasePage {
+
     public MetricsTab(WebDriver driver) {
         super(driver);
     }
+
+
+    @FindBy(name = "metrciObj") WebElement facility;
+
+
+
+
 }
diff --git a/src/main/java/WAB/PageObject/PrintTab.java b/src/main/java/WAB/PageObject/AppTabs/PrintTab.java
similarity index 87%
rename from src/main/java/WAB/PageObject/PrintTab.java
rename to src/main/java/WAB/PageObject/AppTabs/PrintTab.java
index 35af35a..7308121 100644
--- a/src/main/java/WAB/PageObject/PrintTab.java
+++ b/src/main/java/WAB/PageObject/AppTabs/PrintTab.java
@@ -1,4 +1,4 @@
-package WAB.PageObject;
+package WAB.PageObject.AppTabs;
 
 import WAB.BasePage.BasePage;
 import org.openqa.selenium.WebDriver;
diff --git a/src/main/java/WAB/PageObject/ReportsTab.java b/src/main/java/WAB/PageObject/AppTabs/ReportsTab.java
similarity index 59%
rename from src/main/java/WAB/PageObject/ReportsTab.java
rename to src/main/java/WAB/PageObject/AppTabs/ReportsTab.java
index d1b83d8..b6d76cb 100644
--- a/src/main/java/WAB/PageObject/ReportsTab.java
+++ b/src/main/java/WAB/PageObject/AppTabs/ReportsTab.java
@@ -1,6 +1,7 @@
-package WAB.PageObject;
+package WAB.PageObject.AppTabs;
 
 import WAB.BasePage.BasePage;
+import WAB.PageObject.NavigationBar;
 import org.openqa.selenium.WebDriver;
 
 /**
@@ -10,4 +11,12 @@ public class ReportsTab extends BasePage {
     public ReportsTab(WebDriver driver) {
         super(driver);
     }
+
+
+
+
+
+
+
+    public NavigationBar gotoNavigationBar(){return new NavigationBar(driver);}
 }
diff --git a/src/main/java/WAB/PageObject/NavigationBar.java b/src/main/java/WAB/PageObject/NavigationBar.java
index b91c904..461ddb3 100644
--- a/src/main/java/WAB/PageObject/NavigationBar.java
+++ b/src/main/java/WAB/PageObject/NavigationBar.java
@@ -1,6 +1,7 @@
 package WAB.PageObject;
 
 import WAB.BasePage.BasePage;
+import WAB.PageObject.AppTabs.*;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
diff --git a/src/test/java/WAB/TestAPPStartPage.java b/src/test/java/WAB/TestAPPStartPage.java
index a73bf23..6496f8b 100644
--- a/src/test/java/WAB/TestAPPStartPage.java
+++ b/src/test/java/WAB/TestAPPStartPage.java
@@ -29,6 +29,7 @@ public void setUp() {
             // set up browser
             this.driver = new FirefoxDriver();
             driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
+            driver.manage().window().maximize();
 
             // initialize page factory: elements which declare as @FindBy
             mainAppLoginpage = PageFactory.initElements(driver, MainAppLoginpage.class);
@@ -39,12 +40,20 @@ public void setUp() {
             mainAppLoginpage.openLoginpage();
             mainAppLoginpage.signIn();
             mainAppLoginpage.openTargetApp();
+
+        }
+
+        @Test
+        public void checkLoadingApp(){
+
+            Assert.assertEquals(driver.findElement(By.partialLinkText("Workflows")).isDisplayed(), true);
         }
 
         @Test
-        public void searchWFByName(){
+        public void goToMetrics(){
+
             navigationBar.navigateToMetrics();
-            Assert.assertEquals(driver.findElement(By.partialLinkText("Metrics")).isDisplayed(),true);
+            Assert.assertEquals(driver.findElement(By.partialLinkText("Metrics")).isDisplayed(), true);
         }