Updating test page layout
Merged forgot password functionality