Changes to Settings

Changes to Settings Layout and Activity