View Change and Bug Fix