Fix mirror UI style and work on #475
Work on #476
Work on #476