Bug Fix and View Change