importing terence changes
button view
Merge branch 'master' of https://github.com/vusile/xyz
fixing bug for edit link in search form lists