Make option page more useable
release id 3c4e73d85c