1.6.2: fix options page
some refactoring