Changed Settings to PrefereceFragment and also including several bug fixes