Removed merge artifacts
Added partial Options dialog