Update on page switch, clean up