SecondView fix
Clean up