add policies
improve some views