few more ui fixes
Merge branch 'links' into testing