Moving options to the options dialog. fixes #31