Close #1 - page changes now toggle icon state changes