Integrated SPIP in main UI and fixed a small bug