[Feature] Improvements in Options feature. Separate general and site specific options + fix reset settings code