Optimizing BiDi UI

This is far better and tested locally