Fixed minor inconsistencies in Settings