Remove and render views correctly

Make sure we clean them up so we don’t create zombie views and leak
memory.