Rework options visual