Add an option to diable update + Fix + Ui