Tech commit
Added options editing