small modification
changed static classes and methods to non static to follow PageObjectModel