Bidirectional UI fixes