replace invitable, clean up views