updated conf popup
fixed bugs