Fix mirror UI style and work on #475
Work on #476
Work on #476
Merge remote-tracking branch 'origin/master' into pkgr