Integration of UI source
JSONManager null pointer removed