improve styling.
Merge remote-tracking branch 'origin/master'

Conflicts:
	UI/Properties/Settings1.Designer.cs