copy change
lots of ui fixes
Merge branch 'links' into testing