Updated Forget Password, other minor changes