improves settings layout
merges develop