add links show/add views
add links edit views
Merge branch 'tmp' into working