Added popup, modulized settings