ui updates to wiki
Merge branch 'master' into kingman