fix #6
fix #8
fixing options page