[Dl,SB] - Made improvements to Page Object Pattern