some Settings refactoring and styling