added lost password key confirm screens and adjust final layouts before moving logic