Refactored Settings, added Settings window