cleaned and fixed options
cleaned popup