Issues #505 (audit) and #416 (small UI fixes)