Make options section consistent