Page object modification & bug fixing