Integrated version

Add View still have bugs