UI fixes @d18efa9a57ed704fdbdf2c2d9b6d2a8771789886