corrected wrong page objects being used along with some code cleanup