Update to Settings

Added columns and changed panels to buttons