Worked on logout & restoring settings more