add links and remove clock
Merge branch 'local'