Merging Upstream 2.7

Redesigned Settings UI