minors changes on UI and polices.