Initial work on updating views instead of tearing them down