tidy options.html and fix layout, other minor changes